/hg/release/icedtea6-1.6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 613dba6ad21b in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=613dba6ad21b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 27 15:55:16 2010 +0000

	Make --enable-shark work without requiring --enable-zero as well.

	2010-01-15 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4,
		* configure.ac: Make --enable-shark work without requiring
		--enable-zero as well.


changeset 29c75d7fc03a in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=29c75d7fc03a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 27 15:56:02 2010 +0000

	Add missing dates in NEWS file.

	2010-01-27 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Add missing dates.


diffstat:

4 files changed, 37 insertions(+), 30 deletions(-)
ChangeLog    |   12 ++++++++++++
NEWS         |    5 +++--
acinclude.m4 |   48 +++++++++++++++++++++---------------------------
configure.ac |    2 +-

diffs (133 lines):

diff -r 66c327225114 -r 29c75d7fc03a ChangeLog
--- a/ChangeLog	Thu Dec 17 16:59:58 2009 +0000
+++ b/ChangeLog	Wed Jan 27 15:56:02 2010 +0000
@@ -1,3 +1,15 @@ 2009-12-17  Andrew Haley  <aph at redhat.co
+2010-01-27  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS:
+	Add missing dates.
+	
+2010-01-15  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4,
+	* configure.ac:
+	Make --enable-shark work without requiring
+	--enable-zero as well.
+
 2009-12-17  Andrew Haley  <aph at redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Add mkbc.c.
diff -r 66c327225114 -r 29c75d7fc03a NEWS
--- a/NEWS	Thu Dec 17 16:59:58 2009 +0000
+++ b/NEWS	Wed Jan 27 15:56:02 2010 +0000
@@ -16,12 +16,13 @@ New in release 1.6.2 (2009-11-09)
   - (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
   - (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
 
-New in release 1.6.1:
+New in release 1.6.1 (2009-09-14):
+
 - Fix tarball error in 1.6
 - Improve jar performance,
   http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b35f1e5075a4
 
-New in release 1.6:
+New in release 1.6 (2009-09-10):
 
 - Added java method tracing using systemtap version 0.9.9+.
 - Security fixes for:
diff -r 66c327225114 -r 29c75d7fc03a acinclude.m4
--- a/acinclude.m4	Thu Dec 17 16:59:58 2009 +0000
+++ b/acinclude.m4	Wed Jan 27 15:56:02 2010 +0000
@@ -691,21 +691,27 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
     esac
   ],
   [
-    case "${host}" in
-      i?86-*-*) ;;
-      sparc*-*-*) ;;
-      x86_64-*-*) ;;
-      *)
-        if test "x${WITH_CACAO}" != xno; then
-          use_zero=no
-        else
-          use_zero=yes
-        fi
-        ;;
-    esac
+   if test "x${use_shark}" = "xyes"; then
+     use_zero=yes;
+   else
+     case "${host}" in
+       i?86-*-*) ;;
+       sparc*-*-*) ;;
+       x86_64-*-*) ;;
+       *)
+	 use_core=yes
+         if test "x${WITH_CACAO}" != xno; then
+           use_zero=no
+         else
+           use_zero=yes
+         fi
+         ;;
+     esac
+   fi
   ])
   AC_MSG_RESULT($use_zero)
   AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes)
+  AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
 
   ZERO_LIBARCH=
   ZERO_BITSPERWORD=
@@ -766,35 +772,23 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
   AC_CONFIG_FILES([ergo.c])
 ])
 
-AC_DEFUN([SET_CORE_OR_SHARK_BUILD],
+AC_DEFUN([SET_SHARK_BUILD],
 [
   AC_MSG_CHECKING(whether to use the Shark JIT)
-  shark_selected=no
   AC_ARG_ENABLE([shark], [AS_HELP_STRING(--enable-shark, use Shark JIT)],
   [
     case "${enableval}" in
       no)
+        use_shark=no
         ;;
       *)
-        shark_selected=yes
+        use_shark=yes
         ;;
     esac
   ])
 
-  use_core=no
-  use_shark=no
-  if test "x${WITH_CACAO}" != "xno"; then
-    use_core=yes
-  elif test "x${use_zero}" = "xyes"; then
-    if test "x${shark_selected}" = "xyes"; then
-      use_shark=yes
-    else
-      use_core=yes
-    fi
-  fi
   AC_MSG_RESULT($use_shark)
 
-  AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
 ])
 
diff -r 66c327225114 -r 29c75d7fc03a configure.ac
--- a/configure.ac	Thu Dec 17 16:59:58 2009 +0000
+++ b/configure.ac	Wed Jan 27 15:56:02 2010 +0000
@@ -236,8 +236,8 @@ AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
 ENABLE_OPTIMIZATIONS
+SET_SHARK_BUILD
 ENABLE_ZERO_BUILD
-SET_CORE_OR_SHARK_BUILD
 ENABLE_HG
 AC_CHECK_WITH_HG_REVISION