/hg/icedtea6: Fix building with --enable-systemtap and GCC 4.5.

[Andrew John Hughes]

Mark,

Does this fix for PR476
(http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=476) look ok to
backport to the release branches?

Thanks.

On 28 April 2010 14:20,  <andrew at icedtea.classpath.org> wrote:
> changeset b86fa01ca5ca in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b86fa01ca5ca
> author: Andrew John Hughes <ahughes at redhat.com>
> date: Wed Apr 28 14:20:33 2010 +0100
>
>        Fix building with --enable-systemtap and GCC 4.5.
>
>        2010-04-28 Andrew John Hughes <ahughes at redhat.com>
>
>         * 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).
>
>
> diffstat:
>
> 3 files changed, 22 insertions(+), 1 deletion(-)
> ChangeLog                       |    9 +++++++++
> Makefile.am                     |    3 ++-
> patches/systemtap-gcc-4.5.patch |   11 +++++++++++
>
> diffs (44 lines):
>
> diff -r 727bee274d9e -r b86fa01ca5ca ChangeLog
> --- a/ChangeLog Sat Apr 24 15:32:51 2010 +0200
> +++ b/ChangeLog Wed Apr 28 14:20:33 2010 +0100
> @@ -1,3 +1,12 @@ 2010-04-24  Matthias Klose  <doko at ubuntu
> +2010-04-28  Andrew John Hughes  <ahughes at redhat.com>
> +
> +       * 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-04-24  Matthias Klose  <doko at ubuntu.com>
>
>        * Makefile.am (check-langtools, check-jdk): Allow overwriting -samevm
> diff -r 727bee274d9e -r b86fa01ca5ca Makefile.am
> --- a/Makefile.am       Sat Apr 24 15:32:51 2010 +0200
> +++ b/Makefile.am       Wed Apr 28 14:20:33 2010 +0100
> @@ -354,7 +354,8 @@ endif
>  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 727bee274d9e -r b86fa01ca5ca 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 14:20:33 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;
> +     }
> +   }
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8