/hg/icedtea7: PR1617: Include defs.make in vm.make so zeroshark....

[andrew at icedtea.classpath.org]

changeset e3973c9a8608 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e3973c9a8608
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Dec 12 16:34:21 2013 +0000

	PR1617: Include defs.make in vm.make so zeroshark.make is included

	2013-12-12  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1617: Include defs.make in vm.make so
		zeroshark.make is included
		* Makefile.am:
		(JDK_CHANGESET): Set to current HEAD.
		(JDK_SHA256SUM): Likewise.
		* NEWS: Updated with changes brought in.
		* hotspot.map: Set to current HEAD.


diffstat:

 ChangeLog   |  10 ++++++++++
 Makefile.am |   4 ++--
 NEWS        |   7 +++++--
 hotspot.map |   2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 2ded946dc6b6 -r e3973c9a8608 ChangeLog
--- a/ChangeLog	Wed Oct 23 05:28:22 2013 +0100
+++ b/ChangeLog	Thu Dec 12 16:34:21 2013 +0000
@@ -1,3 +1,13 @@
+2013-12-12  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1617: Include defs.make in vm.make so
+	zeroshark.make is included
+	* Makefile.am:
+	(JDK_CHANGESET): Set to current HEAD.
+	(JDK_SHA256SUM): Likewise.
+	* NEWS: Updated with changes brought in.
+	* hotspot.map: Set to current HEAD.
+
 2013-10-23  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Add 2.4.3 release notes.
diff -r 2ded946dc6b6 -r e3973c9a8608 Makefile.am
--- a/Makefile.am	Wed Oct 23 05:28:22 2013 +0100
+++ b/Makefile.am	Thu Dec 12 16:34:21 2013 +0000
@@ -7,14 +7,14 @@
 CORBA_CHANGESET = e5da8ecaf6f9
 JAXP_CHANGESET = fc76c585e6c5
 JAXWS_CHANGESET = b28455339003
-JDK_CHANGESET = 99a2c23b1d94
+JDK_CHANGESET = 0ff397456868
 LANGTOOLS_CHANGESET = db375fd08fa3
 OPENJDK_CHANGESET = 51c1d39f82ae
 
 CORBA_SHA256SUM = d8c4e9792352a40011e8bc4bd302d94cbd12cf63d50d4edb3396724474d5c0d5
 JAXP_SHA256SUM = 35210f1d5cd741504310dbd5eb848735a8bd66157d3d9c5caa507c8fc65fcf3c
 JAXWS_SHA256SUM = d7e47d15ae3d7a9db53e72ad597ea52d2c76a8c49827b36c789424177c727c25
-JDK_SHA256SUM = 3fd16ec7053697296550258ad29b68b9a6453c73028dceb7f098a76382873fef
+JDK_SHA256SUM = b95568aa9665865b7c74a0a42bb7531b3808d7b6ae4347501c190cc76373b3c9
 LANGTOOLS_SHA256SUM = cf5962e23bf093ccfd9318e07d9fe19ce0da6026af740229f6ec90900f27073e
 OPENJDK_SHA256SUM = 785d4ad0a1dddd831c5fc315949dc9602e482bb2265a4dd6704ec3766237bed6
 
diff -r 2ded946dc6b6 -r e3973c9a8608 NEWS
--- a/NEWS	Wed Oct 23 05:28:22 2013 +0100
+++ b/NEWS	Thu Dec 12 16:34:21 2013 +0000
@@ -12,7 +12,11 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.5.0 (2012-XX-XX):
+New in release 2.5.0 (2013-XX-XX):
+
+* Bug fixes
+ - Fix implicit function declarations
+ - PR1617: Include defs.make in vm.make so zeroshark.make is included
 
 New in release 2.4.3 (2013-10-21):
 
@@ -1810,7 +1814,6 @@
   - PR716: IcedTea7 should bootstrap with IcedTea6
   - Fix indentation on Makefile block not executed when STRIP_POLICY=no_strip is set
   - JEP167: Fix invalid XSL stylesheets and DTD.
-  - Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set.
   - Make sure libffi cflags and libs are used.
   - PR1378: Add AArch64 support to Zero
   - PR1170: Ensure unlimited crypto policy is in place.
diff -r 2ded946dc6b6 -r e3973c9a8608 hotspot.map
--- a/hotspot.map	Wed Oct 23 05:28:22 2013 +0100
+++ b/hotspot.map	Thu Dec 12 16:34:21 2013 +0000
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 62c7dcedbbc4 239baded58afa74a9f5ccba3caf0a7554f4f1085fed3dc4bc81553e8e2c2ecf9
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 9d01164b2dfc 0c0db223f315b31431a802d5f6b7f76d980c4c72eeff680bb1964187b66dd835