Mercurial > hg > icedtea7

changeset 2783:8e3f9f2452ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to icedtea-2.6pre20. Upstream changes: - PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc. - PR2228 - Add ARM32 JIT - PR2233, RH1190835: Discover gsettings symbols separately so early versions of GLib can be used (e.g. on RHEL 6) - PR2236: ppc64le should report its os.arch as ppc64le so tools can detect it - PR2250: JSSE server is still limited to 768-bit DHE - S6956398, PR2250: make ephemeral DH key match the length of the certificate key - S8071947: AARCH64: frame::safe_for_sender() computes incorrect sender_sp value for interpreted frames - S8072483: AARCH64: aarch64.ad uses the wrong operand class for some operations - S8074312, PR2254: Enable hotspot builds on 4.x Linux kernels - Several bug fixes to get eclipse working 2015-04-03 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.6pre20. (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. (ICEDTEA_BOOT_PATCHES): Turn on new underscored literals patch when the compiler doesn't support them. * NEWS: Updated. * acinclude.m4: (IT_UNDERSCORE_CHECK): Check that the compiler supports underscored literals. * configure.ac: Bump to 2.6.0pre20 and run IT_UNDERSCORE_CHECK. * hotspot.map.in: Update to icedtea-2.6pre20. * patches/boot/ecj-underscored_literals.patch: New patch to remove underscored literals in sun.security.ssl.ServerHandshaker
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Sun, 05 Apr 2015 22:35:29 +0100
parents 5d905b7fe1ac
children 223af819bea8
files ChangeLog Makefile.am NEWS acinclude.m4 configure.ac hotspot.map.in patches/boot/ecj-underscored_literals.patch
diffstat 7 files changed, 108 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 26 18:14:33 2015 +0000
+++ b/ChangeLog	Sun Apr 05 22:35:29 2015 +0100
@@ -1,3 +1,31 @@
+2015-04-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.6pre20.
+	(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.
+	(ICEDTEA_BOOT_PATCHES): Turn on new underscored literals
+	patch when the compiler doesn't support them.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_UNDERSCORE_CHECK): Check that the compiler supports
+	underscored literals.
+	* configure.ac:
+	Bump to 2.6.0pre20 and run IT_UNDERSCORE_CHECK.
+	* hotspot.map.in: Update to icedtea-2.6pre20.
+	* patches/boot/ecj-underscored_literals.patch:
+	New patch to remove underscored literals in
+	sun.security.ssl.ServerHandshaker
+
 2015-03-26  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS:
--- a/Makefile.am	Thu Mar 26 18:14:33 2015 +0000
+++ b/Makefile.am	Sun Apr 05 22:35:29 2015 +0100
@@ -4,19 +4,19 @@
 BUILD_VERSION = b05
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = e4d788ed1e07
-JAXP_CHANGESET = 0e0fc4440a3b
-JAXWS_CHANGESET = 26c7686a4f96
-JDK_CHANGESET = 29fdd3e4a432
-LANGTOOLS_CHANGESET = 4c600e18a7e4
-OPENJDK_CHANGESET = 55ce37199ce3
+CORBA_CHANGESET = 4ca25161dc2a
+JAXP_CHANGESET = 3bb57abb921f
+JAXWS_CHANGESET = c901dec7bc96
+JDK_CHANGESET = 25ae097ee625
+LANGTOOLS_CHANGESET = 1a60fa408f57
+OPENJDK_CHANGESET = 10d65b91c33c
 
-CORBA_SHA256SUM = a35777981808b6d22a777887239c99fcb64a5fb1ddbe81e8dd4693fdb4a515a8
-JAXP_SHA256SUM = ee8efc66d0343ee0b0b195241fd48d512019e2cf77a181ecbd9e8ffb68418b21
-JAXWS_SHA256SUM = 761b772eb43b0c433be78c22fb57e69b072e1b29fac38c7f0eb1db0eb1f299c7
-JDK_SHA256SUM = a041d63fa0c987b1d6063fcbc1fae90ad906a17f26bebd78d7e8b143a1a5875f
-LANGTOOLS_SHA256SUM = df55f5e1cd338ab847c5c29a4a12e193aa177e38115b20f0fccee51a12b48a7f
-OPENJDK_SHA256SUM = cfee6723939f82da1bc4ff622ea88ef63cd43880e4cb9701049c807558a28e32
+CORBA_SHA256SUM = 038202eb0daf849028c28ada6e11e0b8ef0308c26d45f94a0aefb834a4d41bf2
+JAXP_SHA256SUM = c8b4d8d304f00773f914fc5798b381a165d81095a1175de3f1809fea99bcbfae
+JAXWS_SHA256SUM = 0408a8a0c02b84ed7b7701c0572dfae0fc886713614b2fcdada81b3d30a1ce23
+JDK_SHA256SUM = f36a988dccfa8e802ff1d6248c1ea69a6653ba7527933e81b5c0480da65e6a13
+LANGTOOLS_SHA256SUM = 9f1b3252e84759750bc8259d6b2d94ccf8f778d56fe6fa7dca2c9a70a317bd48
+OPENJDK_SHA256SUM = af57bdf261cf377f5cdabab4a8a271a838b8f7969be7331d99390ff39f6f7b0a
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -387,6 +387,10 @@
 endif
 endif
 
+if JAVAC_LACKS_UNDERSCORED_LITERALS
+ICEDTEA_BOOT_PATCHES += patches/boot/ecj-underscored_literals.patch
+endif
+
 if DTDTYPE_QNAME
 ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
 endif
--- a/NEWS	Thu Mar 26 18:14:33 2015 +0000
+++ b/NEWS	Sun Apr 05 22:35:29 2015 +0100
@@ -23,6 +23,7 @@
   - S6695379: Copy method annotations and parameter annotations to synthetic bridge methods
   - S6883953: java -client -XX:ValueMapInitialSize=0 crashes
   - S6931564: Incorrect display name of Locale for south africa
+  - S6956398, PR2250: make ephemeral DH key match the length of the certificate key
   - S6976528: PS: assert(!limit_exceeded || softrefs_clear) failed: Should have been cleared
   - S6984762: Invalid close of file descriptor '-1' in findZoneinfoFile
   - S6993873: java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java test indicates ".a frame wasn't focused on click" jdk7 issue on linux
@@ -328,6 +329,7 @@
   - S8068405: GenerateCurrencyData throws RuntimeException for old data
   - S8068507: (fc) Rename the new jdk.net.enableFastFileTransfer system property to jdk.nio.enableFastFileTransfer
   - S8068639: Make certain annotation classfile warnings opt-in
+  - S8074312, PR2254: Enable hotspot builds on 4.x Linux kernels
 * Backports
   - S6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
 * Bug fixes
@@ -339,11 +341,20 @@
   - PR2196, RH1164762: jhat man page has broken URL
   - PR2200: Support giflib 5.1.0
   - PR2210: DGifCloseFile call should check the return value, not the error code, for failure
+  - PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc.
+  - PR2233, RH1190835: Discover gsettings symbols separately so early versions of GLib can be used (e.g. on RHEL 6)
+  - PR2236: ppc64le should report its os.arch as ppc64le so tools can detect it
+  - PR2250: JSSE server is still limited to 768-bit DHE
 * AArch64 port
   - Add java.lang.ref.Reference.get intrinsic to template interpreter
   - Fix implementation of InterpreterMacroAssembler::increment_mdp_data_at().
   - Remove insanely large stack allocation in entry frame.
+  - S8071947: AARCH64: frame::safe_for_sender() computes incorrect sender_sp value for interpreted frames
   - S8072129: [AARCH64] missing fix for 8066900
+  - S8072483: AARCH64: aarch64.ad uses the wrong operand class for some operations
+* ARM32 port
+  - PR2228: Add ARM32 JIT
+  - Several bug fixes to get Eclipse working
 
 New in release 2.5.4 (2015-01-21):
 
--- a/acinclude.m4	Thu Mar 26 18:14:33 2015 +0000
+++ b/acinclude.m4	Sun Apr 05 22:35:29 2015 +0100
@@ -2913,3 +2913,42 @@
 AM_CONDITIONAL([CP64174], test x"${it_cv_cp64174}" = "xyes")
 AC_PROVIDE([$0])dnl
 ])
+
+AC_DEFUN([IT_UNDERSCORE_CHECK],[
+  AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
+  AC_CACHE_CHECK([if javac lacks support for underscored literals], it_cv_underscore, [
+  CLASS=Test.java
+  BYTECODE=$(echo $CLASS|sed 's#\.java##')
+  mkdir tmp.$$
+  cd tmp.$$
+  cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+
+public class Test
+{
+    public static void main(String[] args)
+    {
+      if (args.length == 0)
+      	 System.exit(-1);
+      long value = Long.parseLong(args[0]);
+      if ((value & 0xffff_ffff_0000_0000L) == 0)
+        System.out.println(args[0] + " is below Integer.MAX_VALUE");
+    }
+}]
+EOF
+  if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+    if $JAVA -classpath . $BYTECODE $$ >&AS_MESSAGE_LOG_FD 2>&1 ; then
+       it_cv_underscore=no;
+    else
+       it_cv_underscore=yes;
+    fi
+  else
+    it_cv_underscore=yes;
+  fi
+  rm -f $CLASS *.class
+  cd ..
+  rmdir tmp.$$
+  ])
+AM_CONDITIONAL([JAVAC_LACKS_UNDERSCORED_LITERALS], test x"${it_cv_underscore}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
--- a/configure.ac	Thu Mar 26 18:14:33 2015 +0000
+++ b/configure.ac	Sun Apr 05 22:35:29 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0pre19], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.0pre20], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -153,6 +153,7 @@
 
 IT_CHECK_ENABLE_WARNINGS
 IT_DIAMOND_CHECK
+IT_UNDERSCORE_CHECK
 IT_BYTECODE7_CHECK
 IT_USE_BOOTSTRAP_TOOLS
 IT_CHECK_FOR_XBOOTCLASSPATH
--- a/hotspot.map.in	Thu Mar 26 18:14:33 2015 +0000
+++ b/hotspot.map.in	Sun Apr 05 22:35:29 2015 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 8f3c9cf0636f f15695c17c75dcab85d94f9be9a93378da88cdf8d1c4685115a260c61b823702
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 904317834a25 b5d129a569016dadd359b7aa7b28b4832476b3eec2aafe42e21f1c9fd85f18de
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/ecj-underscored_literals.patch	Sun Apr 05 22:35:29 2015 +0100
@@ -0,0 +1,11 @@
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java.old	2015-04-03 20:33:29.164024020 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java	2015-04-03 20:33:38.840136632 +0100
+@@ -1850,7 +1850,7 @@
+                     return Integer.parseInt(s, radix);
+                 } else {
+                     long ell = Long.parseLong(s, radix);
+-                    if ((ell & 0xffff_ffff_0000_0000L) == 0) {
++                    if ((ell & 0xffffffff00000000L) == 0) {
+                         return (int) ell;
+                     } else {
+                         throw new