# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1272492272 -3600
# Node ID 54c929c868e421e11fb9575d1e02dfb78f5e55ee
# Parent  e78e331c336a6e3bd0f78c65d31ddaff72b9ee4d
PR476: Enable building SystemTap on GCC 4.5.

2010-04-28  Andrew John Hughes  <ahughes@redhat.com>

	PR icedtea/476
	* Makefile.am:
	Add patch when SystemTap is enabled to support
	building with GCC 4.5.
	* patches/systemtap-gcc-4.5.patch:
	Add cast to NULL (doesn't apply to DTrace due
	to differences between SystemTap and DTrace macros).

diff -r e78e331c336a -r 54c929c868e4 ChangeLog
--- a/ChangeLog	Wed Mar 31 22:57:45 2010 +0100
+++ b/ChangeLog	Wed Apr 28 23:04:32 2010 +0100
@@ -1,3 +1,13 @@
+2010-04-28  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR icedtea/476
+	* Makefile.am:
+	Add patch when SystemTap is enabled to support
+	building with GCC 4.5.
+	* patches/systemtap-gcc-4.5.patch:
+	Add cast to NULL (doesn't apply to DTrace due
+	to differences between SystemTap and DTrace macros).
+
 2010-03-31  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am: Add Ant patch.
diff -r e78e331c336a -r 54c929c868e4 Makefile.am
--- a/Makefile.am	Wed Mar 31 22:57:45 2010 +0100
+++ b/Makefile.am	Wed Apr 28 23:04:32 2010 +0100
@@ -720,7 +720,8 @@
 endif
 
 if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/systemtap.patch
+ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/systemtap.patch \
+	patches/systemtap-gcc-4.5.patch
 endif
 
 if ENABLE_NSS
diff -r e78e331c336a -r 54c929c868e4 patches/systemtap-gcc-4.5.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/systemtap-gcc-4.5.patch	Wed Apr 28 23:04:32 2010 +0100
@@ -0,0 +1,11 @@
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 08:51:29.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 09:29:22.000000000 +0100
+@@ -2723,7 +2723,7 @@
+ 
+   if (!directBufferSupportInitializeEnded) {
+     if (!initializeDirectBufferSupport(env, thread)) {
+-      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
++      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL);
+       return NULL;
+     }
+   }