Mercurial > hg > icedtea10
changeset 2608:241cf3509015
PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed
2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR2768: Move SystemTap GCC 4.5 patch to OpenJDK
tree or discard if no longer needed
* patches/systemtap-gcc-4.5.patch:
Removed; seems to be no longer needed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patch.
* NEWS: Updated.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Fri, 29 Jan 2016 14:24:16 +0000 |
parents | 77d56f3ec0cf |
children | a84cfe9142fd |
files | ChangeLog Makefile.am NEWS patches/systemtap-gcc-4.5.patch |
diffstat | 4 files changed, 11 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 29 14:18:11 2016 +0000 +++ b/ChangeLog Fri Jan 29 14:24:16 2016 +0000 @@ -1,3 +1,13 @@ +2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR2768: Move SystemTap GCC 4.5 patch to OpenJDK + tree or discard if no longer needed + * patches/systemtap-gcc-4.5.patch: + Removed; seems to be no longer needed. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patch. + * NEWS: Updated. + 2016-01-28 Andrew John Hughes <gnu.andrew@member.fsf.org> Bump to icedtea-3.0.0pre08.
--- a/Makefile.am Fri Jan 29 14:18:11 2016 +0000 +++ b/Makefile.am Fri Jan 29 14:24:16 2016 +0000 @@ -255,10 +255,6 @@ patches/pulse-soundproperties.patch endif -if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += patches/systemtap-gcc-4.5.patch -endif - if BUILD_JAMVM ICEDTEA_PATCHES += \ patches/jamvm/find_class_from_caller.patch
--- a/NEWS Fri Jan 29 14:18:11 2016 +0000 +++ b/NEWS Fri Jan 29 14:24:16 2016 +0000 @@ -128,6 +128,7 @@ - PR2743: Remove bad AArch64 merge fragment - PR2759: LCMS library should be named javalcms, not lcms, to avoid potential conflicts with the system library - PR2767: Remove remaining rogue binaries from OpenJDK tree + - PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed - PR2777: Fix MAX/MIN template usage on s390 - PR2815: Race condition in SunEC provider with system NSS - Don't substitute 'j' for '-j' inside -I directives
--- a/patches/systemtap-gcc-4.5.patch Fri Jan 29 14:18:11 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2012-09-07 02:29:01.040390936 +0100 -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2012-09-07 03:46:24.311575358 +0100 -@@ -4483,7 +4483,7 @@ - if (!directBufferSupportInitializeEnded) { - if (!initializeDirectBufferSupport(env, thread)) { - #ifndef USDT2 -- DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL); -+ DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL); - #else /* USDT2 */ - HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_RETURN( - NULL);