RFC: icedtea7-2.1: Bump Hotspot to bring in unified syntax for thumb code and support glib >= 2.32.

[Andrew Hughes]

----- Original Message -----
> Hi team,
> I would like to commit two changes to the icedtea7-2.1 release
> branch.
> 
> 1. a fix for a missing -lgthread-2.0 to gcc that cause the following
> error:
> src/solaris/native/sun/awt/gtk2_interface.c:218: undefined reference
> to `g_thread_init'
> http://icedtea.classpath.org/hg/icedtea7/raw-rev/ab3f4766a208
> 
> 2. and a bump of the hotspot changeset to bring in;
> http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/rev/26f5d8596931
> this part was missing in the recent arm_port import from icedtea6
> into icedtea7. It fixes the following compile error on thumb2 arm
> systems:
> /build/buildd/openjdk-7-7~u3-2.1.1~pre1/build/openjdk-boot/hotspot/src/cpu/zero/vm/arm_cas.S:
> Assembler messages:
> /build/buildd/openjdk-7-7~u3-2.1.1~pre1/build/openjdk-boot/hotspot/src/cpu/zero/vm/arm_cas.S:13:
> Error: lo register required -- `stmfd sp!,{r4,r5,r6,r7}'
> /build/buildd/openjdk-7-7~u3-2.1.1~pre1/build/openjdk-boot/hotspot/src/cpu/zero/vm/arm_cas.S:19:
> Error: Thumb does not support conditional execution
> /build/buildd/openjdk-7-7~u3-2.1.1~pre1/build/openjdk-boot/hotspot/src/cpu/zero/vm/arm_cas.S:20:
> Error: incorrect condition in IT block -- `bne 1f'
> /build/buildd/openjdk-7-7~u3-2.1.1~pre1/build/openjdk-boot/hotspot/src/cpu/zero/vm/arm_cas.S:27:
> Error: lo register required -- `ldmfd sp!,{r4,r5,r6,r7}'
> make[8]: *** [arm_cas.o] Error 1
> 
> Cheers
> Xerxes
> 

Approved.

> 
> diff -r 8ea793eccbd1 ChangeLog
> --- a/ChangeLog	Tue Apr 03 01:16:08 2012 +0100
> +++ b/ChangeLog	Wed Apr 11 15:34:11 2012 +0200
> @@ -1,3 +1,15 @@
> +2012-04-11  Xerxes Rånby  <xerxes at zafena.se>
> +
> +	* Makefile.am:
> +	(HOTSPOT_CHANGESET): Sync to HEAD.
> +	(HOTSPOT_SHA256SUM): Likewise.
> +
> +2012-04-06  Andrew John Hughes  <ahughes at redhat.com>
> +
> +	* acinclude.m4:
> +	(IT_CHECK_FOR_GTK): Work with glib >= 2.32
> +	by explicitly asking for gthread.
> +
>  2012-03-29  Andrew John Hughes  <ahughes at redhat.com>
> 
>           * Makefile.am:
> diff -r 8ea793eccbd1 Makefile.am
> --- a/Makefile.am	Tue Apr 03 01:16:08 2012 +0100
> +++ b/Makefile.am	Wed Apr 11 15:34:11 2012 +0200
> @@ -5,7 +5,7 @@
>  COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
> 
>  CORBA_CHANGESET = 5617f6c5cc94
> -HOTSPOT_CHANGESET = 30c4dc24823a
> +HOTSPOT_CHANGESET = 26f5d8596931
>  JAXP_CHANGESET = 1cf75c0e2c96
>  JAXWS_CHANGESET = 7edfbfe974f2
>  JDK_CHANGESET = 2d8ad70a2243
> @@ -13,7 +13,7 @@
>  OPENJDK_CHANGESET = 22cc03983e20
> 
>  CORBA_SHA256SUM =
>  963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3
> -HOTSPOT_SHA256SUM =
> 1a9290c85a280a21256c96e98f2461a88481d63fc4792725845caaeb155fa623
> +HOTSPOT_SHA256SUM =
> 3bf8b0a93105a0a6dbc657eaf7c95b5dd9a8dc478544e75b9e90571632f6a522
>  JAXP_SHA256SUM =
>  8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e
>  JAXWS_SHA256SUM =
>  823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa
>  JDK_SHA256SUM =
>  a3f1748212086feb3351772c1bc3eb6a2918fac474a37bec219d97b668676f40
> diff -r 8ea793eccbd1 acinclude.m4
> --- a/acinclude.m4	Tue Apr 03 01:16:08 2012 +0100
> +++ b/acinclude.m4	Wed Apr 11 15:34:11 2012 +0200
> @@ -2011,7 +2011,7 @@
>    AC_MSG_RESULT(${ENABLE_SYSTEM_GTK})
>    if test x"${ENABLE_SYSTEM_GTK}" = "xyes"; then
>      dnl Check for Gtk+ headers and libraries.
> -    PKG_CHECK_MODULES(GTK, gtk+-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
> +    PKG_CHECK_MODULES(GTK, gtk+-2.0
> gthread-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
>      if test "x${GTK_FOUND}" = xno
>      then
>        AC_MSG_ERROR([Could not find Gtk+; install Gtk+ or build with
>        --disable-system-gtk to use the in-tree headers.])
> 

-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07