[IcedTea6 1.11] Disable shark

[Dr Andrew John Hughes]

On 17:07 Mon 09 Jan     , Omair Majid wrote:
> Hi,
> 
> I am currently testing the attached patch which disables shark. I would 
> like to add it to the IcedTea6 1.11 branch.
> 
> Can others please give this a spin to make sure it doesn't break 
> anything (else)?
> 

The patch looks sane.  I'll try and give it a test run later once I have
a copy of 1.11 set up.

The logic in IT_SET_SHARK_BUILD is odd.  I see no reason for having both
shark_selected and use_shark.  Obviously, not something we should change
here though.

> Once this is committed, I will also re-target all shark 1.11 "blocker" 
> bugs to 1.12.
> 

I've made a separate tracker for Shark:

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=853

I don't think it's appropriate to make decisions about this and 1.12 just
yet, until we seem some progress on these issues.

> Thanks,
> Omair

> diff -r 7e179e0b02ca ChangeLog
> --- a/ChangeLog	Fri Jan 06 17:00:51 2012 -0500
> +++ b/ChangeLog	Mon Jan 09 17:01:26 2012 -0500
> @@ -1,3 +1,8 @@
> +2012-01-09  Omair Majid  <omajid at redhat.com>
> +
> +	* acinclude.m4 (IT_SET_SHARK_BUILD): Error out if shark is enabled.
> +	* NEWS: Update with note describing shark has been disabled.
> +
>  2012-01-06  Jiri Vanek  <jvanek at redhat.com>
>  
>  	fixes rhbz#580478
> diff -r 7e179e0b02ca NEWS
> --- a/NEWS	Fri Jan 06 17:00:51 2012 -0500
> +++ b/NEWS	Mon Jan 09 17:01:26 2012 -0500
> @@ -16,6 +16,7 @@
>  * ARM assembly language port reinstated and updated; details below.
>  * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
>  * Drop the outdated NIO2 backport.  Users who want NIO2 should use IcedTea 2.x.
> +* Shark has been disabled
>  * Bug fixes
>    - PR637: make check should exit with an error code if any regression test failed.
>    - PR752: ImageFormatException extends Exception not RuntimeException
> diff -r 7e179e0b02ca acinclude.m4
> --- a/acinclude.m4	Fri Jan 06 17:00:51 2012 -0500
> +++ b/acinclude.m4	Mon Jan 09 17:01:26 2012 -0500
> @@ -786,6 +786,8 @@
>    AC_CONFIG_FILES([ergo.c])
>  ])
>  
> +# shark has been very unstable (and/or broken) recently due to various
> +# changes in hotspot and llvm. It is not supported in this release.
>  AC_DEFUN([IT_SET_SHARK_BUILD],
>  [
>    AC_MSG_CHECKING(whether to use the Shark JIT)
> @@ -806,7 +808,10 @@
>        use_shark=yes
>    fi
>    AC_MSG_RESULT($use_shark)
> -
> +# remove the following check to enable shark
> +  if test "x${shark_selected}" = "xyes"; then
> +      AC_MSG_ERROR([shark is unsupported in this release])
> +  fi
>    AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
>  ])
>  


-- 
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120110/0e674d7a/attachment.bin