/hg/release/icedtea7-2.6: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Mar 25 07:44:05 UTC 2016
changeset f4cb60668a04 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=f4cb60668a04
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 00:37:24 2016 +0000
PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/cacao/pr2781-refactoring_error.patch:
Backport of refactoring fix from
https://bitbucket.org/Ringdingcoder/cacao-staging
changeset 4cb6efb70fb8 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=4cb6efb70fb8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 02:51:29 2016 +0000
PR2803: Make system CUPS optional
2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2803: Make system CUPS optional
* INSTALL: Document --enable-system-cups.
* Makefile.am:
(ICEDTEA_ENV): Set SYSTEM_CUPS to the
value of ENABLE_SYSTEM_CUPS rather than 'true'.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_CUPS): Only check for the library
if --enable-system-cups is on.
changeset 9c7fc3a0e38b in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=9c7fc3a0e38b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 03:02:15 2016 +0000
PR2893: test/tapset/jstaptest.pl should be executable
2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2893: test/tapset/jstaptest.pl should be executable
* Makefile.am:
(check-tapset-probes): Check that Perl is available
and, if so, use it to invoke the script.
(check-tapset-jstack): Likewise.
* NEWS: Updated.
* configure.ac:
Check for Perl if SystemTap is found, so the
tests can be run if required.
changeset 8a4faf89eb11 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=8a4faf89eb11
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 03:08:56 2016 +0000
PR2894: Add missing test directory in make check
2016-03-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2894: Add missing test directory in make check
* Makefile.am:
(CRYPTO_CHECK_BUILD_DIR): Locate inside the test
directory.
(jtregcheck): Create the test directory if it
doesn't exist.
(check-tapset-probes): Likewise.
(check-tapset-jstack): Likewise.
* NEWS: Updated.
changeset 05925d7e6144 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=05925d7e6144
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 03:18:14 2016 +0000
PR2886: Location of 'stap' executable is hard-coded
2016-03-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2886: Location of 'stap' executable is hard-coded
* Makefile.am:
(check-tapset-probes): Check for STAP and invoke
generated script from build directory.
(check-tapset-jstack): Likewise.
* NEWS: Updated.
* configure.ac: Detect stap and warn if not found.
Generate test/tapset/jstaptest.pl.
* test/tapset/jstaptest.pl.in:
Moved from test/tapset/jstaptest.pl. Fill in location
of stap and perl binaries from configure output.
Fix capitalisation of "IcedTea".
changeset 7f6e4a7d8d51 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=7f6e4a7d8d51
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 05:38:58 2016 +0000
Bump to icedtea-2.6.5.
Upstream changes:
- Bump to icedtea-2.6.5
- PR2852: Add support for large code cache
- PR2852: Apply ReservedCodeCacheSize default limiting to AArch64 only.
- S6425769: Allow specifying an address to bind JMX remote connector
- S6425769, PR2858: Allow specifying an address to bind JMX remote connector
- S6961123: setWMClass fails to null-terminate WM_CLASS string
- S8028727, PR2814: [parfait] warnings from b116 for jdk.src.share.native.sun.security.ec: JNI pending exceptions
- S8034797, PR2851: AIX: Fix os::naked_short_sleep() in os_aix.cpp after 8028280
- S8048512, PR2814: Uninitialised memory in jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
- S8071705. PR2819, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
- S8081289, PR2852: aarch64: add support for RewriteFrequentPairs in interpreter
- S8131483, PR2852: aarch64: illegal stlxr instructions
- S8133352, PR2852: aarch64: generates constrained unpredictable instructions
- S8133842, PR2852: aarch64: C2 generates illegal instructions with int shifts >=32
- S8134322, PR2852: AArch64: Fix several errors in C2 biased locking implementation
- S8136615, PR2852: aarch64: elide DecodeN when followed by CmpP 0
- S8138575, PR2852: Improve generated code for profile counters
- S8138641, PR2852: Disable C2 peephole by default for aarch64
- S8138966, PR2852: Intermittent SEGV running ParallelGC
- S8139258, PR2851: PPC64LE: argument passing problem when passing 15 floats in native call
- S8139421, PR2851: PPC64LE: MacroAssembler::bxx64_patchable kill register R12
- S8143067, PR2852: aarch64: guarantee failure in javac
- S8143285, PR2852: aarch64: Missing load acquire when checking if ConstantPoolCacheEntry is resolved
- S8143584, PR2852: Load constant pool tag and class status with load acquire
- S8144201, PR2852: aarch64: jdk/test/com/sun/net/httpserver/Test6a.java fails with --enable-unlimited-crypto
- S8144582, PR2852: AArch64 does not generate correct branch profile data
- S8145982: JMXInterfaceBindingTest is failing intermittently
- S8145982, PR2858: JMXInterfaceBindingTest is failing intermittently
- S8146015: JMXInterfaceBindingTest is failing intermittently for IPv6 addresses
- S8146015, PR2858: JMXInterfaceBindingTest is failing intermittently for IPv6 addresses
- S8146709, PR2852: AArch64: Incorrect use of ADRP for byte_map_base
- S8147805, PR2852: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject
- S8148240, PR2852: aarch64: random infrequent null pointer exceptions in javac
- S8150954, PR2866, RH1176206: AWT Robot not compatible with GNOME Shell
- S8152335: Improve MethodHandle consistency
2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
Bump to icedtea-2.6.5.
* INSTALL: Update X11 dependency documentation.
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 99.
(CORBA_CHANGESET): Update to icedtea-2.6.5.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.6.5. Add check
for libXcomposite as required by fix
for PR2866. Correct variables used by
xproto check.
* hotspot.map.in: Update to icedtea-2.6.5.
* patches/boot/ecj-multicatch.patch:
Add new cases in java.lang.invoke.MemberName
and sun.invoke.util.VerifyAccess
changeset 72847c7c840d in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=72847c7c840d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 05:40:09 2016 +0000
Set release date for 2.6.5.
2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Set release date.
changeset cc7d9dff49cb in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=cc7d9dff49cb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 07:32:03 2016 +0000
Added tag icedtea-2.6.5 for changeset 72847c7c840d
diffstat:
.hgtags | 1 +
ChangeLog | 94 ++
INSTALL | 4 +-
Makefile.am | 54 +-
NEWS | 46 +-
acinclude.m4 | 25 +-
configure.ac | 27 +-
hotspot.map.in | 2 +-
patches/boot/ecj-multicatch.patch | 31 +
patches/cacao/pr2781-refactoring_error.patch | 107 ++
test/tapset/jstaptest.pl | 1045 --------------------------
test/tapset/jstaptest.pl.in | 1045 ++++++++++++++++++++++++++
12 files changed, 1406 insertions(+), 1075 deletions(-)
diffs (truncated from 2646 to 500 lines):
diff -r 53d8bc340c6a -r cc7d9dff49cb .hgtags
--- a/.hgtags Mon Jan 25 16:34:24 2016 +0000
+++ b/.hgtags Fri Mar 25 07:32:03 2016 +0000
@@ -66,3 +66,4 @@
aa92a611ed4ea7a55790b5ce81c486614bc213e2 icedtea-2.6.2
17770cf44bc6da12e4e465bfb65f7966dfac4ef9 icedtea-2.6.3
c9ed028a5bd92024c7f7cb75e6baf994d7b0bc6a icedtea-2.6.4
+72847c7c840d9ec1849a9d8d85226e0634d003bf icedtea-2.6.5
diff -r 53d8bc340c6a -r cc7d9dff49cb ChangeLog
--- a/ChangeLog Mon Jan 25 16:34:24 2016 +0000
+++ b/ChangeLog Fri Mar 25 07:32:03 2016 +0000
@@ -1,3 +1,97 @@
+2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Set release date.
+
+2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ Bump to icedtea-2.6.5.
+ * INSTALL: Update X11 dependency documentation.
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 99.
+ (CORBA_CHANGESET): Update to icedtea-2.6.5.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.6.5. Add check
+ for libXcomposite as required by fix
+ for PR2866. Correct variables used by
+ xproto check.
+ * hotspot.map.in: Update to icedtea-2.6.5.
+ * patches/boot/ecj-multicatch.patch:
+ Add new cases in java.lang.invoke.MemberName
+ and sun.invoke.util.VerifyAccess
+
+2016-03-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2886: Location of 'stap' executable is hard-coded
+ * Makefile.am:
+ (check-tapset-probes): Check for STAP and invoke
+ generated script from build directory.
+ (check-tapset-jstack): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Detect stap and warn if not found.
+ Generate test/tapset/jstaptest.pl.
+ * test/tapset/jstaptest.pl.in:
+ Moved from test/tapset/jstaptest.pl. Fill in location
+ of stap and perl binaries from configure output.
+ Fix capitalisation of "IcedTea".
+
+2016-03-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2894: Add missing test directory in make check
+ * Makefile.am:
+ (CRYPTO_CHECK_BUILD_DIR): Locate inside the test
+ directory.
+ (jtregcheck): Create the test directory if it
+ doesn't exist.
+ (check-tapset-probes): Likewise.
+ (check-tapset-jstack): Likewise.
+ * NEWS: Updated.
+
+2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2893: test/tapset/jstaptest.pl should be executable
+ * Makefile.am:
+ (check-tapset-probes): Check that Perl is available
+ and, if so, use it to invoke the script.
+ (check-tapset-jstack): Likewise.
+ * NEWS: Updated.
+ * configure.ac:
+ Check for Perl if SystemTap is found, so the
+ tests can be run if required.
+
+2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2803: Make system CUPS optional
+ * INSTALL: Document --enable-system-cups.
+ * Makefile.am:
+ (ICEDTEA_ENV): Set SYSTEM_CUPS to the
+ value of ENABLE_SYSTEM_CUPS rather than 'true'.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_CUPS): Only check for the library
+ if --enable-system-cups is on.
+
+2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays:
+ Assertion `dest && result && x.any && y.any' failed
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/cacao/pr2781-refactoring_error.patch:
+ Backport of refactoring fix from
+ https://bitbucket.org/Ringdingcoder/cacao-staging
+
2016-01-25 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 2.6.5 section.
diff -r 53d8bc340c6a -r cc7d9dff49cb INSTALL
--- a/INSTALL Mon Jan 25 16:34:24 2016 +0000
+++ b/INSTALL Fri Mar 25 07:32:03 2016 +0000
@@ -11,7 +11,7 @@
- GNU libgcj 4.4.0 (or equivalent class library based on GNU Classpath >= 0.95) (--enable-bootstrap mode only, the default)
- IcedTea6 or IcedTea7
CUPS
-libX11 (libXp, libXtst, libXi, libXt, libXinerama)
+libX11 (xproto, libX11, libXext, libXtst, libXi, libXt, libXinerama, libXrender, libXcomposite, libXau, libXdmcp)
Freetype2
patch
sed
@@ -126,6 +126,8 @@
* --enable-system-kerberos: Link against the system Kerberos library and
query it at runtime to obtain the cache location, rather than using a
hardcoded value.
+* --enable-system-cups: Build and link against the system installation of
+ CUPS instead of trying to dynamically open it at runtime.
* --enable-compile-against-syscalls: Check for syscalls at compile-time not runtime.
* --with-gcj: Compile ecj to native code with gcj prior to building.
* --with-parallel-jobs: Run the specified number of parallel jobs when
diff -r 53d8bc340c6a -r cc7d9dff49cb Makefile.am
--- a/Makefile.am Mon Jan 25 16:34:24 2016 +0000
+++ b/Makefile.am Fri Mar 25 07:32:03 2016 +0000
@@ -1,22 +1,22 @@
# Dependencies
-JDK_UPDATE_VERSION = 95
+JDK_UPDATE_VERSION = 99
BUILD_VERSION = b00
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 2135da66cc53
-JAXP_CHANGESET = bc6edb6c12a7
-JAXWS_CHANGESET = 271b555de438
-JDK_CHANGESET = dc86038147b2
-LANGTOOLS_CHANGESET = fd0a34cb97b4
-OPENJDK_CHANGESET = 4f1e498cad9c
-
-CORBA_SHA256SUM = 26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08
-JAXP_SHA256SUM = 097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62
-JAXWS_SHA256SUM = da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1
-JDK_SHA256SUM = 9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63
-LANGTOOLS_SHA256SUM = f9b0ce14c73c263276d3dfe78601714869cd2c0463bd01c637c8556d52a7d7cc
-OPENJDK_SHA256SUM = bb02e71972ad606e739c79fc11c6dc61b4840a526a41049a600a206cc37152e2
+CORBA_CHANGESET = 389551542e13
+JAXP_CHANGESET = 8a56658cb829
+JAXWS_CHANGESET = 9c049d7f5adc
+JDK_CHANGESET = e727fe32654c
+LANGTOOLS_CHANGESET = f6593c32cc46
+OPENJDK_CHANGESET = 8e728c41fec5
+
+CORBA_SHA256SUM = 427969fdd78513a11ddd9d5131a068e0b26ca2c8f14951bf8b161fecd07fe77f
+JAXP_SHA256SUM = 7bb5e1bc9f0807061e157aeb356dd0e3b9fa019fb316beee3aa0181a335ba37a
+JAXWS_SHA256SUM = 4e759ade7e47713f6f26afc1ffcd02f2edf967582fae2ec6b4d73dc81be926d0
+JDK_SHA256SUM = cd3810553b1066c21f2fe08a73de72e38ba7e72295cd32dec70db481a24421ba
+LANGTOOLS_SHA256SUM = 6c6c676c60af61638a0c3176f0312fcc0abad16d1d3cdbe11aeefcc3357a78d9
+OPENJDK_SHA256SUM = c66f56a91a6fa9e3c889bbbc5432a4e082b7d3735188fb508fa7ec70c142abdb
DROP_URL = http://icedtea.classpath.org/download/drops
@@ -69,7 +69,7 @@
STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
-CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
@@ -385,7 +385,8 @@
patches/cacao/memory.patch \
patches/cacao/pr2032.patch \
patches/cacao/pr2520-tempdir.patch \
- patches/cacao/pr2652-classloader.patch
+ patches/cacao/pr2652-classloader.patch \
+ patches/cacao/pr2781-refactoring_error.patch
else
if USING_CACAO
ICEDTEA_PATCHES += \
@@ -617,7 +618,7 @@
STATIC_CXX="false" \
BUILD_GCC="$(CC)" \
BUILD_CXX="$(CXX)" \
- SYSTEM_CUPS="true" \
+ SYSTEM_CUPS="${ENABLE_SYSTEM_CUPS}" \
CUPS_LIBS="${CUPS_LIBS}" \
CUPS_CFLAGS="${CUPS_CFLAGS}" \
STRIP_POLICY=no_strip \
@@ -2814,6 +2815,7 @@
| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,$(CURDIR)/$(sdkimg))/ {print $$1}'
jtregcheck: $(TESTS_TO_RUN)
+ $(MKDIR_P) test
for i in $(TEST_SUITES); do \
echo "--------------- jtreg console summary for $$i ---------------"; \
egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' test/check-$$i.log; \
@@ -2844,14 +2846,28 @@
check-tapset-probes:
if ENABLE_SYSTEMTAP
- $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ if test "x${PERL}" = "x"; then \
+ echo "ERROR: Perl not found"; exit -1; \
+ fi
+ if test "x${STAP}" = "x"; then \
+ echo "ERROR: stap not found"; exit -1; \
+ fi
+ $(MKDIR_P) test
+ ${PERL} $(abs_top_builddir)/test/tapset/jstaptest.pl \
-B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
-S $(abs_top_srcdir)/test/tapset \
-a test/check-stap.log -p
endif
check-tapset-jstack:
if ENABLE_SYSTEMTAP
- $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ if test "x${PERL}" = "x"; then \
+ echo "ERROR: Perl not found"; exit -1; \
+ fi
+ if test "x${STAP}" = "x"; then \
+ echo "ERROR: stap not found"; exit -1; \
+ fi
+ $(MKDIR_P) test
+ ${PERL} $(abs_top_builddir)/test/tapset/jstaptest.pl \
-B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
-S $(abs_top_srcdir)/test/tapset \
-a test/check-stap.log -j
diff -r 53d8bc340c6a -r cc7d9dff49cb NEWS
--- a/NEWS Mon Jan 25 16:34:24 2016 +0000
+++ b/NEWS Fri Mar 25 07:32:03 2016 +0000
@@ -12,7 +12,51 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.6.5 (2016-04-XX):
+New in release 2.6.5 (2016-03-24):
+
+* Security fixes
+ - S8152335, CVE-2016-0636: Improve MethodHandle consistency
+* Import of OpenJDK 7 u99 build 0
+ - S6425769, PR2858: Allow specifying an address to bind JMX remote connector
+ - S6961123: setWMClass fails to null-terminate WM_CLASS string
+ - S8145982, PR2858: JMXInterfaceBindingTest is failing intermittently
+ - S8146015, PR2858: JMXInterfaceBindingTest is failing intermittently for IPv6 addresses
+* Backports
+ - S8028727, PR2814: [parfait] warnings from b116 for jdk.src.share.native.sun.security.ec: JNI pending exceptions
+ - S8048512, PR2814: Uninitialised memory in jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+ - S8071705. PR2819, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
+ - S8150954, PR2866, RH1176206: AWT Robot not compatible with GNOME Shell
+* Bug fixes
+ - PR2803: Make system CUPS optional
+ - PR2886: Location of 'stap' executable is hard-coded
+ - PR2893: test/tapset/jstaptest.pl should be executable
+ - PR2894: Add missing test directory in make check.
+* CACAO
+ - PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
+* AArch64 port
+ - PR2852: Add support for large code cache
+ - PR2852: Apply ReservedCodeCacheSize default limiting to AArch64 only.
+ - S8081289, PR2852: aarch64: add support for RewriteFrequentPairs in interpreter
+ - S8131483, PR2852: aarch64: illegal stlxr instructions
+ - S8133352, PR2852: aarch64: generates constrained unpredictable instructions
+ - S8133842, PR2852: aarch64: C2 generates illegal instructions with int shifts >=32
+ - S8134322, PR2852: AArch64: Fix several errors in C2 biased locking implementation
+ - S8136615, PR2852: aarch64: elide DecodeN when followed by CmpP 0
+ - S8138575, PR2852: Improve generated code for profile counters
+ - S8138641, PR2852: Disable C2 peephole by default for aarch64
+ - S8138966, PR2852: Intermittent SEGV running ParallelGC
+ - S8143067, PR2852: aarch64: guarantee failure in javac
+ - S8143285, PR2852: aarch64: Missing load acquire when checking if ConstantPoolCacheEntry is resolved
+ - S8143584, PR2852: Load constant pool tag and class status with load acquire
+ - S8144201, PR2852: aarch64: jdk/test/com/sun/net/httpserver/Test6a.java fails with --enable-unlimited-crypto
+ - S8144582, PR2852: AArch64 does not generate correct branch profile data
+ - S8146709, PR2852: AArch64: Incorrect use of ADRP for byte_map_base
+ - S8147805, PR2852: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject
+ - S8148240, PR2852: aarch64: random infrequent null pointer exceptions in javac
+* PPC & AIX port
+ - S8034797, PR2851: AIX: Fix os::naked_short_sleep() in os_aix.cpp after 8028280
+ - S8139258, PR2851: PPC64LE: argument passing problem when passing 15 floats in native call
+ - S8139421, PR2851: PPC64LE: MacroAssembler::bxx64_patchable kill register R12
New in release 2.6.4 (2016-01-19):
diff -r 53d8bc340c6a -r cc7d9dff49cb acinclude.m4
--- a/acinclude.m4 Mon Jan 25 16:34:24 2016 +0000
+++ b/acinclude.m4 Fri Mar 25 07:32:03 2016 +0000
@@ -2178,13 +2178,28 @@
AC_DEFUN_ONCE([IT_CHECK_FOR_CUPS],
[
- dnl Check for CUPS headers and libraries.
- AC_CHECK_LIB([cups], [cupsServer],
- , [AC_MSG_ERROR([Could not find CUPS library; install CUPS.])])
+ dnl The CUPS headers are always required
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
, [AC_MSG_ERROR([Could not find CUPS headers; install CUPS (including cups-devel on binary distros).])])
- CUPS_LIBS="-lcups"
- AC_SUBST(CUPS_LIBS)
+ AC_MSG_CHECKING([whether to use the system CUPS install])
+ AC_ARG_ENABLE([system-cups],
+ [AS_HELP_STRING(--enable-system-cups,use the system CUPS [[default=yes]])],
+ [
+ ENABLE_SYSTEM_CUPS="${enableval}"
+ ],
+ [
+ ENABLE_SYSTEM_CUPS="yes"
+ ])
+ AC_MSG_RESULT(${ENABLE_SYSTEM_CUPS})
+ if test x"${ENABLE_SYSTEM_CUPS}" = "xyes"; then
+ dnl Check for CUPS libraries
+ AC_CHECK_LIB([cups], [cupsServer],
+ , [AC_MSG_ERROR([Could not find CUPS library; install CUPS.])])
+ CUPS_LIBS="-lcups"
+ AC_SUBST(CUPS_LIBS)
+ fi
+ AM_CONDITIONAL(USE_SYSTEM_CUPS, test x"${ENABLE_SYSTEM_CUPS}" = "xyes")
+ AC_SUBST(ENABLE_SYSTEM_CUPS)
])
AC_DEFUN_ONCE([IT_CHECK_FOR_SYSCALLS],
diff -r 53d8bc340c6a -r cc7d9dff49cb configure.ac
--- a/configure.ac Mon Jan 25 16:34:24 2016 +0000
+++ b/configure.ac Fri Mar 25 07:32:03 2016 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.5pre00], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.5], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
@@ -237,8 +237,8 @@
AC_MSG_ERROR([Could not find Xproto headers - \
Try installing xorg-x11-proto-devel.])
fi
-AC_SUBST(XT_CFLAGS)
-AC_SUBST(XT_LIBS)
+AC_SUBST(XPROTO_CFLAGS)
+AC_SUBST(XPROTO_LIBS)
dnl Check for libXt headers and libraries.
PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no])
@@ -278,6 +278,13 @@
Try installing libXrender-devel.])
fi
+PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, [XCOMPOSITE_FOUND=yes], [XCOMPOSITE_FOUND=no])
+if test "x${XCOMPOSITE_FOUND}" = xno
+then AC_MSG_ERROR([Could not find Xcomposite extension. Try installing libXcomposite-devel.])
+fi
+AC_SUBST(XCOMPOSITE_CFLAGS)
+AC_SUBST(XCOMPOSITE_LIBS)
+
AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
[SDT_H_FOUND='no';
AC_MSG_WARN([systemtap support needs sys/sdt.h header])])
@@ -317,6 +324,19 @@
inst.method(24);
]])], [AC_MSG_RESULT([yes])], [SDT_H_FOUND='no'; AC_MSG_WARN([systemtap sdt.h or g++ too old])])
AC_LANG_POP([C++])
+if test "x${SDT_H_FOUND}" = "xyes"; then
+ AC_PATH_TOOL([PERL],[perl])
+ if test x"${PERL}" = x ; then
+ AC_MSG_WARN([Perl not found in PATH; SystemTap tests will not be able to run])
+ fi
+ AC_SUBST(PERL)
+ AC_PATH_TOOL([STAP],[stap])
+ if test x"${STAP}" = x ; then
+ AC_MSG_WARN([stap not found in PATH; SystemTap tests will not be able to run])
+ fi
+ AC_SUBST(STAP)
+fi
+
AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes])
ABS_CLIENT_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
@@ -327,6 +347,7 @@
AC_CONFIG_FILES([tapset/hotspot_jni.stp])
AC_CONFIG_FILES([tapset/jstack.stp])
AC_CONFIG_FILES([tapset/hotspot_gc.stp])
+AC_CONFIG_FILES([test/tapset/jstaptest.pl])
dnl Check for libXtst headers and libraries.
PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no])
diff -r 53d8bc340c6a -r cc7d9dff49cb hotspot.map.in
--- a/hotspot.map.in Mon Jan 25 16:34:24 2016 +0000
+++ b/hotspot.map.in Fri Mar 25 07:32:03 2016 +0000
@@ -1,2 +1,2 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 19d919ae5506 3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 04d7046d2d41 43983232fb10abeac99478e7045c04a93fef86185e2b9ee9c7b46f2903441cfc
diff -r 53d8bc340c6a -r cc7d9dff49cb patches/boot/ecj-multicatch.patch
--- a/patches/boot/ecj-multicatch.patch Mon Jan 25 16:34:24 2016 +0000
+++ b/patches/boot/ecj-multicatch.patch Fri Mar 25 07:32:03 2016 +0000
@@ -706,3 +706,34 @@
}
}
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-03-25 04:42:21.295105700 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2016-03-25 04:43:14.778216824 +0000
+@@ -862,7 +862,12 @@
+ m = MethodHandleNatives.resolve(m, lookupClass);
+ m.checkForTypeAlias(m.getDeclaringClass());
+ m.resolution = null;
+- } catch (ClassNotFoundException | LinkageError ex) {
++ } catch (ClassNotFoundException ex) {
++ // JVM reports that the "bytecode behavior" would get an error
++ assert(!m.isResolved());
++ m.resolution = ex;
++ return m;
++ } catch (LinkageError ex) {
+ // JVM reports that the "bytecode behavior" would get an error
+ assert(!m.isResolved());
+ m.resolution = ex;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java 2016-03-25 04:42:03.663398723 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java 2016-03-25 04:42:45.170708900 +0000
+@@ -222,7 +222,9 @@
+ public Class<?> run() {
+ try {
+ return Class.forName(name, false, refcLoader);
+- } catch (ClassNotFoundException | LinkageError e) {
++ } catch (ClassNotFoundException e) {
++ return null; // Assume the class is not found
++ } catch (LinkageError e) {
+ return null; // Assume the class is not found
+ }
+ }
diff -r 53d8bc340c6a -r cc7d9dff49cb patches/cacao/pr2781-refactoring_error.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2781-refactoring_error.patch Fri Mar 25 07:32:03 2016 +0000
@@ -0,0 +1,107 @@
+# HG changeset patch
+# User Stefan Ring <stefan at complang.tuwien.ac.at>
+# Date 1453933756 -3600
+# Node ID 4982d429274b9498ad2629ea4f28566ed69e4775
+# Parent 1cef439b53ee701662059ae50874d55c7b5302d7
+PR195: Fix some oversights during a large macro cleanup in 1e9787c3484e
+
+diff --git cacao/cacao/src/vm/jit/verify/typecheck-common.cpp cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+--- cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
++++ cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+@@ -281,7 +281,7 @@
+
+ dv->type = sv->type;
+ if (dv->type == TYPE_ADR) {
+- dv->typeinfo = sv->typeinfo;
++ typeinfo_t::clone(sv->typeinfo, dv->typeinfo);
+ }
+ }
+ return true;
+diff --git cacao/cacao/src/vm/jit/verify/typeinfo.cpp cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+--- cacao/cacao/src/vm/jit/verify/typeinfo.cpp
++++ cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+@@ -1674,6 +1674,7 @@
+ classref_or_classinfo common;
+ classref_or_classinfo elementclass;
+ int dimension;
++ ArrayType new_elementtype;
+ bool changed;
+ typecheck_result r;
+
+@@ -1784,23 +1785,23 @@
+ * interpret it as an array (same dim. as x) of Arraystubs. */
+ if (x->dimension < src->dimension) {
+ dimension = x->dimension;
+- elementtype = ARRAYTYPE_OBJECT;
++ new_elementtype = ARRAYTYPE_OBJECT;
+ elementclass.cls = pseudo_class_Arraystub;
+ }
+ else {
+ dimension = src->dimension;
+- elementtype = src->elementtype;
++ new_elementtype = src->elementtype;
+ elementclass = src->elementclass;
+ }
+
+ /* {The arrays are of the same dimension.} */
+
+- if (x->elementtype != elementtype) {
++ if (x->elementtype != new_elementtype) {
+ /* Different element types are merged, so the resulting array
+ * type has one accessible dimension less. */
+ if (--dimension == 0) {
+ common.cls = pseudo_class_Arraystub;
+- elementtype = ARRAYTYPE_INT;
++ new_elementtype = ARRAYTYPE_INT;
+ elementclass.any = NULL;
+ }
+ else {
+@@ -1810,14 +1811,14 @@
More information about the distro-pkg-dev
mailing list