/hg/icedtea7: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Sep 20 07:06:41 PDT 2013
changeset 7008ba71f12f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7008ba71f12f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:08:53 2013 +0100
Sync with forest HEAD.
2013-09-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(OPENJDK_VERSION): Set to b00.
(JDK_UPDATE_VERSION): Set to 60.
(CORBA_CHANGESET): Update to current HEAD.
(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.
* hotspot.map: Update to HEAD.
* patches/boot/ecj-diamond.patch:
Regenerated.
* patches/boot/ecj-trywithresources.patch:
Add case in java.nio.file.Files.
changeset 936f8f54db3a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=936f8f54db3a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:13:18 2013 +0100
Enable system LCMS only if 2.5 or above is available.
2013-07-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Turn system LCMS on by
default if the version is 2.5 or above with the
latest security fixes.
changeset 41bf342bdb3e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=41bf342bdb3e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:20:07 2013 +0100
Update autoconf following recent fixes.
2013-09-09 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Add -D_LITTLE_ENDIAN to arm
and support arm64|aarch64.
(IT_ENABLE_ZERO_BUILD): Explicitly set ZERO_BITSPERWORD
for aarch64, alpha, arm, ia64 && sh. Replace sparc64 with
sparcv9 which is what INSTALL_ARCH_DIR is set to.
2013-08-30 Andrew John Hughes <gnu.andrew at redhat.com>
* INSTALL: Update with --enable-system-kerberos
option.
* Makefile.am:
(ICEDTEA_ENV): Set SYSTEM_KRB5, KRB5_LIBS
and KRB5_CFLAGS.
* acinclude.m4:
(IT_CHECK_FOR_KERBEROS): Add --enable-system-kerberos
option (on by default) which checks for libkrb5 and
the krb5.h header.
* configure.ac: Invoke IT_CHECK_FOR_KERBEROS.
changeset d561879ac19c in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d561879ac19c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:22:34 2013 +0100
Make versioning variables more obvious and name tarballs better.
2013-09-10 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(BUILD_VERSION): Renamed from OPENJDK_VERSION.
(COMBINED_VERSION): Use BUILD_VERSION.
(ICEDTEA_ENV): Likewise.
(dist-openjdk): Should really use COMBINED_VERSION.
(dist-openjdk-fsg): Likewise.
(dist-openjdk-fsg-tz): Additional target which
makes an xz tarball instead of a zip (for Jiri ;)
changeset 45fd9fd91644 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=45fd9fd91644
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:18:18 2013 +0100
Make LCMS error message mention version required.
2013-09-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Make error message mention
version.
changeset 0c77e9a81a9b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=0c77e9a81a9b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 14:26:50 2013 +0100
Sync IT_WITH_HOTSPOT_BUILD with 2.4.
2013-06-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_WITH_HOTSPOT_BUILD): Define once.
* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
by IT_WITH_HOTSPOT_BUILD.
diffstat:
ChangeLog | 78 +-
INSTALL | 3 +
Makefile.am | 47 +-
acinclude.m4 | 43 +-
configure.ac | 3 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 3024 +++++++++++++++---------------
patches/boot/ecj-trywithresources.patch | 237 +-
8 files changed, 1788 insertions(+), 1649 deletions(-)
diffs (truncated from 5424 to 500 lines):
diff -r 731375f0ba2e -r 0c77e9a81a9b ChangeLog
--- a/ChangeLog Tue Sep 17 19:44:28 2013 +0200
+++ b/ChangeLog Fri Sep 20 14:26:50 2013 +0100
@@ -1,3 +1,79 @@
+2013-06-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_WITH_HOTSPOT_BUILD): Define once.
+ * configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
+ by IT_WITH_HOTSPOT_BUILD.
+
+2013-09-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Make error message mention
+ version.
+
+2013-09-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (BUILD_VERSION): Renamed from OPENJDK_VERSION.
+ (COMBINED_VERSION): Use BUILD_VERSION.
+ (ICEDTEA_ENV): Likewise.
+ (dist-openjdk): Should really use COMBINED_VERSION.
+ (dist-openjdk-fsg): Likewise.
+ (dist-openjdk-fsg-tz): Additional target which
+ makes an xz tarball instead of a zip (for Jiri ;)
+
+2013-09-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Add -D_LITTLE_ENDIAN to arm
+ and support arm64|aarch64.
+ (IT_ENABLE_ZERO_BUILD): Explicitly set ZERO_BITSPERWORD
+ for aarch64, alpha, arm, ia64 && sh. Replace sparc64 with
+ sparcv9 which is what INSTALL_ARCH_DIR is set to.
+
+2013-08-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * INSTALL: Update with --enable-system-kerberos
+ option.
+ * Makefile.am:
+ (ICEDTEA_ENV): Set SYSTEM_KRB5, KRB5_LIBS
+ and KRB5_CFLAGS.
+ * acinclude.m4:
+ (IT_CHECK_FOR_KERBEROS): Add --enable-system-kerberos
+ option (on by default) which checks for libkrb5 and
+ the krb5.h header.
+ * configure.ac: Invoke IT_CHECK_FOR_KERBEROS.
+
+2013-07-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Turn system LCMS on by
+ default if the version is 2.5 or above with the
+ latest security fixes.
+
+2013-09-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Set to b00.
+ (JDK_UPDATE_VERSION): Set to 60.
+ (CORBA_CHANGESET): Update to current HEAD.
+ (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.
+ * hotspot.map: Update to HEAD.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated.
+ * patches/boot/ecj-trywithresources.patch:
+ Add case in java.nio.file.Files.
+
2013-09-17 Xerxes RÃ¥nby <xerxes at zafena.se>
Robert Lougher <rob at jamvm.org.uk>
@@ -12,7 +88,7 @@
* Makefile.am
(JAMVM_VERSION): Updated JamVM to 2013-08-28 revision.
(JAMVM_SHA256SUM): Updated.
-
+
2013-08-30 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
diff -r 731375f0ba2e -r 0c77e9a81a9b INSTALL
--- a/INSTALL Tue Sep 17 19:44:28 2013 +0200
+++ b/INSTALL Fri Sep 20 14:26:50 2013 +0100
@@ -201,6 +201,9 @@
* --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-system-kerberos: Link against the system Kerberos library and
+ query it at runtime to obtain the cache location, rather than using a
+ hardcoded value.
Testing
=======
diff -r 731375f0ba2e -r 0c77e9a81a9b Makefile.am
--- a/Makefile.am Tue Sep 17 19:44:28 2013 +0200
+++ b/Makefile.am Fri Sep 20 14:26:50 2013 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b31
-JDK_UPDATE_VERSION = 40
-COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
+JDK_UPDATE_VERSION = 60
+BUILD_VERSION = b00
+COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 2abbbec3c03c
-JAXP_CHANGESET = 9ce0c87f3e87
-JAXWS_CHANGESET = 7278e9a73874
-JDK_CHANGESET = afaedb56b499
-LANGTOOLS_CHANGESET = c523dcea4ff3
-OPENJDK_CHANGESET = 424e7e279ef6
+CORBA_CHANGESET = e5da8ecaf6f9
+JAXP_CHANGESET = fc76c585e6c5
+JAXWS_CHANGESET = b28455339003
+JDK_CHANGESET = 99a2c23b1d94
+LANGTOOLS_CHANGESET = db375fd08fa3
+OPENJDK_CHANGESET = 51c1d39f82ae
-CORBA_SHA256SUM = 659a2018c44ecc7bc3c287431bd92b5504270ccad81d22f3ff0bcc8aa92a1b75
-JAXP_SHA256SUM = 465110701521ee63e73fde3476c1254b3abdbbcf98a95d83d3ad6319b25cec95
-JAXWS_SHA256SUM = 8c41fcc880171b77e4cfed7a03655770776f4f69ba0c936c3baff5f394e87812
-JDK_SHA256SUM = 1f949d7ecf55cd580c2bba9c81cf3436640ead98a3ea17fcf60b9fdadbb1919b
-LANGTOOLS_SHA256SUM = 5ec38227964325397a649c0d1d12b9a64e2a81a35f69da4447708b48b3ad6fd7
-OPENJDK_SHA256SUM = 9fd129437c81a2d8da3b8b176d1dd2a58e656115e08547e4ad819996b5d136d9
+CORBA_SHA256SUM = d8c4e9792352a40011e8bc4bd302d94cbd12cf63d50d4edb3396724474d5c0d5
+JAXP_SHA256SUM = 35210f1d5cd741504310dbd5eb848735a8bd66157d3d9c5caa507c8fc65fcf3c
+JAXWS_SHA256SUM = d7e47d15ae3d7a9db53e72ad597ea52d2c76a8c49827b36c789424177c727c25
+JDK_SHA256SUM = 3fd16ec7053697296550258ad29b68b9a6453c73028dceb7f098a76382873fef
+LANGTOOLS_SHA256SUM = cf5962e23bf093ccfd9318e07d9fe19ce0da6026af740229f6ec90900f27073e
+OPENJDK_SHA256SUM = 785d4ad0a1dddd831c5fc315949dc9602e482bb2265a4dd6704ec3766237bed6
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -433,7 +433,7 @@
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
- BUILD_NUMBER="$(OPENJDK_VERSION)" \
+ BUILD_NUMBER="$(BUILD_VERSION)" \
JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \
MILESTONE="fcs" \
@@ -586,6 +586,13 @@
COMPRESS_JARS="true"
endif
+if USE_SYSTEM_KERBEROS
+ICEDTEA_ENV += \
+ SYSTEM_KRB5="true" \
+ KRB5_LIBS="${KRB5_LIBS}" \
+ KRB5_CFLAGS="${KRB5_CFLAGS}"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
@@ -851,11 +858,15 @@
# Creates archive of openjdk.
dist-openjdk: stamps/extract-cacao.stamp
find openjdk/ -name \\.hg* | xargs rm -rf
- $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/
+ $(ZIP) -r openjdk-$(COMBINED_VERSION) openjdk/
# Creates archive of openjdk that is compliant with Free Software guidelines.
dist-openjdk-fsg: stamps/patch-fsg.stamp
- $(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/
+ $(ZIP) -r openjdk-fsg-$(COMBINED_VERSION) openjdk/
+
+dist-openjdk-fsg-xz: stamps/patch-fsg.stamp
+ tardir=openjdk/ && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c \
+ >openjdk-fsg-$(COMBINED_VERSION).tar.xz
# OpenJDK Source Preparation Targets
# ==================================
diff -r 731375f0ba2e -r 0c77e9a81a9b acinclude.m4
--- a/acinclude.m4 Tue Sep 17 19:44:28 2013 +0200
+++ b/acinclude.m4 Fri Sep 20 14:26:50 2013 +0100
@@ -23,6 +23,13 @@
BUILD_ARCH_DIR=arm
INSTALL_ARCH_DIR=arm
JRE_ARCH_DIR=arm
+ ARCHFLAG="-D_LITTLE_ENDIAN"
+ ;;
+ arm64|aarch64)
+ BUILD_ARCH_DIR=aarch64
+ INSTALL_ARCH_DIR=aarch64
+ JRE_ARCH_DIR=aarch64
+ ARCHFLAG="-D_LITTLE_ENDIAN"
;;
mips)
BUILD_ARCH_DIR=mips
@@ -695,10 +702,10 @@
ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
dnl can't use AC_CHECK_SIZEOF on multilib
case "${ZERO_LIBARCH}" in
- i386|ppc|s390|sparc)
+ arm|i386|ppc|s390|sh|sparc)
ZERO_BITSPERWORD=32
;;
- amd64|ppc64|s390x|sparc64)
+ aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9)
ZERO_BITSPERWORD=64
;;
*)
@@ -940,7 +947,7 @@
AC_SUBST([GCJ])
])
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
[
AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
DEFAULT_BUILD="default"
@@ -1947,10 +1954,10 @@
AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
dnl Check for LCMS2 headers and libraries.
- PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
+ PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
if test "x${LCMS2_FOUND}" = xno
then
- AC_MSG_ERROR([Could not find LCMS2; install LCMS2 or build with --disable-system-lcms to use the in-tree copy.])
+ AC_MSG_ERROR([Could not find LCMS >= 2.5; install it or build with --disable-system-lcms to use the in-tree copy.])
fi
AC_SUBST(LCMS2_CFLAGS)
AC_SUBST(LCMS2_LIBS)
@@ -2061,6 +2068,32 @@
AC_SUBST(ENABLE_SYSTEM_GIF)
])
+dnl Check for Kerberos library in order to lookup cache location at runtime.
+AC_DEFUN_ONCE([IT_CHECK_FOR_KERBEROS],
+[
+ AC_MSG_CHECKING([whether to use the system Kerberos install])
+ AC_ARG_ENABLE([system-kerberos],
+ [AS_HELP_STRING(--enable-system-kerberos,use the system kerberos [[default=yes]])],
+ [
+ ENABLE_SYSTEM_KERBEROS="${enableval}"
+ ],
+ [
+ ENABLE_SYSTEM_KERBEROS="yes"
+ ])
+ AC_MSG_RESULT(${ENABLE_SYSTEM_KERBEROS})
+ if test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes"; then
+ dnl Check for krb5 header and library.
+ AC_CHECK_LIB([krb5], [krb5_cc_default],
+ , [AC_MSG_ERROR([Could not find Kerberos library; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
+ AC_CHECK_HEADER([krb5.h],
+ , [AC_MSG_ERROR([Could not find Kerberos header; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
+ KRB5_LIBS="-lkrb5"
+ AC_SUBST(KRB5_LIBS)
+ fi
+ AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes")
+ AC_SUBST(ENABLE_SYSTEM_KERBEROS)
+])
+
AC_DEFUN_ONCE([IT_CHECK_FOR_GTK],
[
AC_MSG_CHECKING([whether to use the system Gtk+ install])
diff -r 731375f0ba2e -r 0c77e9a81a9b configure.ac
--- a/configure.ac Tue Sep 17 19:44:28 2013 +0200
+++ b/configure.ac Fri Sep 20 14:26:50 2013 +0100
@@ -175,7 +175,6 @@
IT_ENABLE_WERROR
IT_ENABLE_JAR_COMPRESSION
IT_SET_SHARK_BUILD
-IT_ENABLE_ZERO_BUILD
IT_CHECK_ADDITIONAL_VMS
IT_WITH_VERSION_SUFFIX
@@ -198,6 +197,8 @@
AC_PATH_TOOL([GCJ],[gcj])
AC_SUBST([GCJ])
+IT_CHECK_FOR_KERBEROS
+
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([X11/X.h],[]
,[AC_MSG_ERROR("xorg headers were not found -
diff -r 731375f0ba2e -r 0c77e9a81a9b hotspot.map
--- a/hotspot.map Tue Sep 17 19:44:28 2013 +0200
+++ b/hotspot.map Fri Sep 20 14:26:50 2013 +0100
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2efa7b70e843 332e1ccf4a3255a82cfbe962d3e5bee0fe7d3fe6b60bf11572c01262a7183adf
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 62c7dcedbbc4 239baded58afa74a9f5ccba3caf0a7554f4f1085fed3dc4bc81553e8e2c2ecf9
diff -r 731375f0ba2e -r 0c77e9a81a9b patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Tue Sep 17 19:44:28 2013 +0200
+++ b/patches/boot/ecj-diamond.patch Fri Sep 20 14:26:50 2013 +0100
@@ -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-07-08 22:40:57.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-07-12 16:26:50.787265104 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-07-09 23:52:39.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-09-20 00:33:52.220645499 +0100
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
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-07-08 22:40:57.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-12 16:26:50.803265359 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-07-08 21:17:14.363100612 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-09-20 00:33:52.220645499 +0100
@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -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-07-08 22:40:57.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-07-12 16:26:50.803265359 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-07-09 23:52:39.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-09-20 00:33:52.220645499 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +44,8 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:55.970380942 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-07-12 17:07:29.097954416 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-09-20 00:32:35.455450085 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-09-20 00:33:52.220645499 +0100
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -66,9 +66,30 @@
while (keys.hasMoreElements()) {
final String javaName = (String) keys.nextElement();
final String[] mimes = parseMimeTypes(props.getProperty(javaName));
+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 2012-09-24 16:16:01.128926160 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-09-20 00:33:52.220645499 +0100
+@@ -46,7 +46,7 @@
+ */
+ public final class TypeResolver {
+
+- private static final WeakCache<Type, Map<Type, Type>> CACHE = new WeakCache<>();
++ private static final WeakCache<Type, Map<Type, Type>> CACHE = new WeakCache<Type, Map<Type, Type>>();
+
+ /**
+ * Replaces the given {@code type} in an inherited method
+@@ -181,7 +181,7 @@
+ synchronized (CACHE) {
+ map = CACHE.get(actual);
+ if (map == null) {
+- map = new HashMap<>();
++ map = new HashMap<Type, Type>();
+ prepare(map, actual);
+ CACHE.put(actual, map);
+ }
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-07-08 22:41:19.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-07-12 16:26:50.803265359 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-11-30 07:40:05.671148416 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-09-20 00:33:52.220645499 +0100
@@ -62,9 +62,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -83,30 +104,9 @@
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-07-08 22:41:19.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-07-12 16:26:50.803265359 +0100
-@@ -46,7 +46,7 @@
- */
- public final class TypeResolver {
-
-- private static final WeakCache<Type, Map<Type, Type>> CACHE = new WeakCache<>();
-+ private static final WeakCache<Type, Map<Type, Type>> CACHE = new WeakCache<Type, Map<Type, Type>>();
-
- /**
- * Replaces the given {@code type} in an inherited method
-@@ -181,7 +181,7 @@
- synchronized (CACHE) {
- map = CACHE.get(actual);
- if (map == null) {
-- map = new HashMap<>();
-+ map = new HashMap<Type, Type>();
- prepare(map, actual);
- CACHE.put(actual, map);
- }
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-07-08 22:41:19.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-07-12 16:26:50.815265549 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-09-24 16:15:57.304854866 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-09-20 00:33:52.220645499 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -178,8 +178,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-07-12 16:10:24.659639905 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-07-12 16:26:50.815265549 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-09-20 00:32:35.727454321 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-09-20 00:33:52.220645499 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -242,8 +242,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-07-12 16:10:24.511637561 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-07-12 16:26:50.815265549 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-09-20 00:32:33.939426476 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-09-20 00:33:52.220645499 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -253,9 +253,21 @@
for (int i = 0; i < nc; i++) {
InnerClass ic =
new InnerClass(readClassRef(),
+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 2012-09-24 16:15:57.308854939 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-09-20 00:33:52.224645562 +0100
+@@ -402,7 +402,7 @@
+ private static Map<Coding, Coding> codeMap;
+
+ private static synchronized Coding of(int B, int H, int S, int del) {
+- if (codeMap == null) codeMap = new HashMap<>();
++ if (codeMap == null) codeMap = new HashMap<Coding, Coding>();
+ Coding x0 = new Coding(B, H, S, del);
+ 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/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-07-08 22:41:19.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-07-12 16:26:50.815265549 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-02-08 19:35:17.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-09-20 00:33:52.224645562 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -291,22 +303,10 @@
for (int i = start; i < end; i++) {
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-07-08 22:41:19.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-07-12 16:26:50.819265612 +0100
-@@ -402,7 +402,7 @@
- private static Map<Coding, Coding> codeMap;
-
- private static synchronized Coding of(int B, int H, int S, int del) {
-- if (codeMap == null) codeMap = new HashMap<>();
-+ if (codeMap == null) codeMap = new HashMap<Coding, Coding>();
- Coding x0 = new Coding(B, H, S, del);
- 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-07-08 22:41:19.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-07-12 16:26:50.819265612 +0100
-@@ -919,7 +919,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-09-19 18:15:15.900797583 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-09-20 00:33:52.224645562 +0100
+@@ -921,7 +921,7 @@
public static
Index[] partition(Index ix, int[] keys) {
// %%% Should move this into class Index.
@@ -315,7 +315,7 @@
Entry[] cpMap = ix.cpMap;
assert(keys.length == cpMap.length);
for (int i = 0; i < keys.length; i++) {
-@@ -930,7 +930,7 @@
+@@ -932,7 +932,7 @@
}
List<Entry> part = parts.get(key);
if (part == null) {
@@ -324,7 +324,7 @@
}
part.add(cpMap[i]);
}
-@@ -1139,7 +1139,7 @@
+@@ -1141,7 +1141,7 @@
void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) {
cpRefs.remove(null);
for (ListIterator<Entry> work =
More information about the distro-pkg-dev
mailing list