| 1 |
caster 10/05/03 12:32:51 |
| 2 |
|
| 3 |
Added: 6.1.7.3-systemtap-gcc-4.5.patch |
| 4 |
6.1.8.0-systemtap-gcc-4.5.patch |
| 5 |
Log: |
| 6 |
Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the 6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay. |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 6.1.7.3-systemtap-gcc-4.5.patch |
| 16 |
=================================================================== |
| 17 |
# HG changeset patch |
| 18 |
# User Andrew John Hughes <ahughes@××××××.com> |
| 19 |
# Date 1272471515 -3600 |
| 20 |
# Node ID c8d38c28900e01a04d730fc59f899ae0cd1d0779 |
| 21 |
# Parent c30ad39537453fa171d094f3534e79a2faf16fad |
| 22 |
PR476: Enable building SystemTap on GCC 4.5. |
| 23 |
|
| 24 |
2010-04-28 Andrew John Hughes <ahughes@××××××.com> |
| 25 |
|
| 26 |
PR icedtea/476 |
| 27 |
* Makefile.am: |
| 28 |
Add patch when SystemTap is enabled to support |
| 29 |
building with GCC 4.5. |
| 30 |
* patches/systemtap-gcc-4.5.patch: |
| 31 |
Add cast to NULL (doesn't apply to DTrace due |
| 32 |
to differences between SystemTap and DTrace macros). |
| 33 |
|
| 34 |
diff -r c30ad3953745 -r c8d38c28900e ChangeLog |
| 35 |
--- a/ChangeLog Mon Apr 26 14:11:34 2010 +0200 |
| 36 |
+++ b/ChangeLog Wed Apr 28 17:18:35 2010 +0100 |
| 37 |
@@ -1,3 +1,13 @@ |
| 38 |
+2010-04-28 Andrew John Hughes <ahughes@××××××.com> |
| 39 |
+ |
| 40 |
+ PR icedtea/476 |
| 41 |
+ * Makefile.am: |
| 42 |
+ Add patch when SystemTap is enabled to support |
| 43 |
+ building with GCC 4.5. |
| 44 |
+ * patches/systemtap-gcc-4.5.patch: |
| 45 |
+ Add cast to NULL (doesn't apply to DTrace due |
| 46 |
+ to differences between SystemTap and DTrace macros). |
| 47 |
+ |
| 48 |
2010-03-31 Andrew John Hughes <ahughes@××××××.com> |
| 49 |
|
| 50 |
* Makefile.am: Add Ant patch. |
| 51 |
diff -r c30ad3953745 -r c8d38c28900e Makefile.am |
| 52 |
--- a/Makefile.am Mon Apr 26 14:11:34 2010 +0200 |
| 53 |
+++ b/Makefile.am Wed Apr 28 17:18:35 2010 +0100 |
| 54 |
@@ -374,7 +374,8 @@ |
| 55 |
endif |
| 56 |
|
| 57 |
if ENABLE_SYSTEMTAP |
| 58 |
-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch |
| 59 |
+ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \ |
| 60 |
+ patches/systemtap-gcc-4.5.patch |
| 61 |
endif |
| 62 |
|
| 63 |
if ENABLE_NSS |
| 64 |
diff -r c30ad3953745 -r c8d38c28900e patches/systemtap-gcc-4.5.patch |
| 65 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 66 |
+++ b/patches/systemtap-gcc-4.5.patch Wed Apr 28 17:18:35 2010 +0100 |
| 67 |
@@ -0,0 +1,11 @@ |
| 68 |
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 08:51:29.000000000 +0100 |
| 69 |
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 09:29:22.000000000 +0100 |
| 70 |
+@@ -2723,7 +2723,7 @@ |
| 71 |
+ |
| 72 |
+ if (!directBufferSupportInitializeEnded) { |
| 73 |
+ if (!initializeDirectBufferSupport(env, thread)) { |
| 74 |
+- DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL); |
| 75 |
++ DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL); |
| 76 |
+ return NULL; |
| 77 |
+ } |
| 78 |
+ } |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: 6.1.8.0-systemtap-gcc-4.5.patch |
| 88 |
=================================================================== |
| 89 |
# HG changeset patch |
| 90 |
# User Andrew John Hughes <ahughes@××××××.com> |
| 91 |
# Date 1272471515 -3600 |
| 92 |
# Node ID c8d38c28900e01a04d730fc59f899ae0cd1d0779 |
| 93 |
# Parent c30ad39537453fa171d094f3534e79a2faf16fad |
| 94 |
PR476: Enable building SystemTap on GCC 4.5. |
| 95 |
|
| 96 |
2010-04-28 Andrew John Hughes <ahughes@××××××.com> |
| 97 |
|
| 98 |
PR icedtea/476 |
| 99 |
* Makefile.am: |
| 100 |
Add patch when SystemTap is enabled to support |
| 101 |
building with GCC 4.5. |
| 102 |
* patches/systemtap-gcc-4.5.patch: |
| 103 |
Add cast to NULL (doesn't apply to DTrace due |
| 104 |
to differences between SystemTap and DTrace macros). |
| 105 |
|
| 106 |
diff -r c30ad3953745 -r c8d38c28900e ChangeLog |
| 107 |
--- a/ChangeLog Mon Apr 26 14:11:34 2010 +0200 |
| 108 |
+++ b/ChangeLog Wed Apr 28 17:18:35 2010 +0100 |
| 109 |
@@ -1,3 +1,13 @@ |
| 110 |
+2010-04-28 Andrew John Hughes <ahughes@××××××.com> |
| 111 |
+ |
| 112 |
+ PR icedtea/476 |
| 113 |
+ * Makefile.am: |
| 114 |
+ Add patch when SystemTap is enabled to support |
| 115 |
+ building with GCC 4.5. |
| 116 |
+ * patches/systemtap-gcc-4.5.patch: |
| 117 |
+ Add cast to NULL (doesn't apply to DTrace due |
| 118 |
+ to differences between SystemTap and DTrace macros). |
| 119 |
+ |
| 120 |
2010-04-12 Andrew John Hughes <ahughes@××××××.com> |
| 121 |
|
| 122 |
PR icedtea/373 |
| 123 |
diff -r c30ad3953745 -r c8d38c28900e Makefile.am |
| 124 |
--- a/Makefile.am Mon Apr 26 14:11:34 2010 +0200 |
| 125 |
+++ b/Makefile.am Wed Apr 28 17:18:35 2010 +0100 |
| 126 |
@@ -374,7 +374,8 @@ |
| 127 |
endif |
| 128 |
|
| 129 |
if ENABLE_SYSTEMTAP |
| 130 |
-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch |
| 131 |
+ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \ |
| 132 |
+ patches/systemtap-gcc-4.5.patch |
| 133 |
endif |
| 134 |
|
| 135 |
if ENABLE_NSS |
| 136 |
diff -r c30ad3953745 -r c8d38c28900e patches/systemtap-gcc-4.5.patch |
| 137 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 138 |
+++ b/patches/systemtap-gcc-4.5.patch Wed Apr 28 17:18:35 2010 +0100 |
| 139 |
@@ -0,0 +1,11 @@ |
| 140 |
+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 08:51:29.000000000 +0100 |
| 141 |
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 09:29:22.000000000 +0100 |
| 142 |
+@@ -2723,7 +2723,7 @@ |
| 143 |
+ |
| 144 |
+ if (!directBufferSupportInitializeEnded) { |
| 145 |
+ if (!initializeDirectBufferSupport(env, thread)) { |
| 146 |
+- DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL); |
| 147 |
++ DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL); |
| 148 |
+ return NULL; |
| 149 |
+ } |
| 150 |
+ } |
Archives