/hg/icedtea7: S7103224: collision between __LEAF define in inter...

[omajid at icedtea.classpath.org]

changeset 95c4bc033606 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=95c4bc033606
author: Omair Majid <omajid at redhat.com>
date: Thu Oct 27 15:57:25 2011 -0400

	S7103224: collision between __LEAF define in interfaceSupport.hpp
	and /usr/include/sys/cdefs.h with gcc

	2011-10-27 Omair Majid <omajid at redhat.com>

	 * NEWS: Updated.
	    * Makefile.am (HOTSPOT_CHANGESET): Updated.
	(HOTSPOT_SHA256SUM): Updated.


diffstat:

 ChangeLog   |  7 +++++++
 Makefile.am |  4 ++--
 NEWS        |  2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r fb206d077513 -r 95c4bc033606 ChangeLog
--- a/ChangeLog	Wed Oct 19 06:37:14 2011 +0100
+++ b/ChangeLog	Thu Oct 27 15:57:25 2011 -0400
@@ -1,3 +1,10 @@
+2011-10-27  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Updated.
+	* Makefile.am
+	(HOTSPOT_CHANGESET): Updated.
+	(HOTSPOT_SHA256SUM): Updated.
+
 2011-10-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Move recent JamVM changes
diff -r fb206d077513 -r 95c4bc033606 Makefile.am
--- a/Makefile.am	Wed Oct 19 06:37:14 2011 +0100
+++ b/Makefile.am	Thu Oct 27 15:57:25 2011 -0400
@@ -3,7 +3,7 @@
 OPENJDK_VERSION = b147
 
 CORBA_CHANGESET = 4d9e4fb8af09
-HOTSPOT_CHANGESET = b28ae681bae0
+HOTSPOT_CHANGESET = 018d705fd601
 JAXP_CHANGESET = 948e734135ea
 JAXWS_CHANGESET = a2ebfdc9db7e
 JDK_CHANGESET = 2054526dd141
@@ -11,7 +11,7 @@
 OPENJDK_CHANGESET = 0a76e5390e68
 
 CORBA_SHA256SUM = 9579b9f47c45d4e6f4eb080a7a27886163691a77c193d83423389cb87656aec5
-HOTSPOT_SHA256SUM = dcb5a8d4a0a466e3673f891cea40ce163c02f26b0054dfc41c30e0f87c5c2f64
+HOTSPOT_SHA256SUM = 1954905ef693f358ada6bf40ec144fca324ad39798067c5b566cd396737671ed
 JAXP_SHA256SUM = 66948dee25e0224b12587ba150b21dab2e21b260a853bd1272e07c8d08d2e586
 JAXWS_SHA256SUM = 6edd17ac49c33a32538262486c0b8147954100cab43a6ee7023789f3840f22a8
 JDK_SHA256SUM = 4cd94391909ca86d2a5e25e3378c8fde1b1368076577fc58fed57097932750e1
diff -r fb206d077513 -r 95c4bc033606 NEWS
--- a/NEWS	Wed Oct 19 06:37:14 2011 +0100
+++ b/NEWS	Thu Oct 27 15:57:25 2011 -0400
@@ -12,6 +12,8 @@
 
 New in release 2.1 (20XX-XX-XX):
 
+* Bug fixes
+  - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
 * JamVM
   - Implement classlibCheckIfOnLoad().
   - Make thread states JVMTI compatible.