/hg/icedtea7: 6 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Sep 29 20:35:59 PDT 2011 

changeset f75092cac189 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=f75092cac189
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 30 04:07:32 2011 +0100

	Only build bootstrap classes with source/target 1.6 if the VM
	doesn't support 1.7 bytecode.

	2011-09-30 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (ICEDTEA_BOOT_PATCHES): Only apply
	use_target_6_for_bootstrap_classes if 1.7 bytecode is not
	supported by the VM. Fixes bootstrap with IcedTea7.
		* acinclude.m4: (IT_BYTECODE7_CHECK): Check if the VM supports
	1.7 bytecode.
		* configure.ac: Call IT_BYTECODE7_CHECK.


changeset 7cdc3acdda5b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7cdc3acdda5b
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 30 04:25:29 2011 +0100

	Use IcedTea server for CACAO downloads, as with 6.

	2010-11-19 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (CACAO_BASE_URL): Switch to using
	IcedTea server for CACAO drops too. (CACAO_URL):
	Likewise.


changeset 82093e560de2 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=82093e560de2
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue Aug 09 11:34:28 2011 +0200

	CACAO: Updated to 2011-08-08 revision.

	2011-08-09 Xerxes R?nby <xerxes at zafena.se>

	 CACAO
		- CA159: Exception handler blocks / register mixup.
		- Set thread to RUNNABLE during Thread.start.
		- Removed state-setting function call that would be done by the thread
	itself, creating a nasty race.
		* NEWS: Updated.
		* Makefile.am (CACAO_VERSION): Updated CACAO to 2011-08-08
	revision. (CACAO_SHA256SUM): Updated.


changeset 5e706bdbcce9 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5e706bdbcce9
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue Aug 30 12:30:04 2011 +0200

	CACAO: CA149: Used wrong class loader, Updated to 2011-08-29
	revision.

	2011-08-30 Xerxes Ranby <xerxes at zafena.se>

	 CACAO
		- CA149: Used wrong class loader.
		- src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke):
	[OPENJDK] stack index of caller was off by one, causing many apt
	(Annotation Processing Tool) failures.
		* NEWS: Updated.
		* Makefile.am (CACAO_VERSION): Updated CACAO to 2011-08-29
	revision. (CACAO_SHA256SUM): Updated.


changeset a71fd980ed7e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a71fd980ed7e
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 30 04:30:26 2011 +0100

	Cleanup NEWS.

	2011-09-30 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Cleanup.


changeset 875cada723d7 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=875cada723d7
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 30 04:33:46 2011 +0100

	Use tar.gz rather than tar.bz2 for bundle as with IcedTea6.

	2010-11-11 Stefan Ring <stefan at complang.tuwien.ac.at>

	 * Makefile.am: Upgrade CACAO version, use .tar.gz
	archive


diffstat:

 ChangeLog    |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am  |  17 ++++++++++-------
 NEWS         |  13 +++++++++----
 acinclude.m4 |  32 ++++++++++++++++++++++++++++++++
 configure.ac |   1 +
 5 files changed, 104 insertions(+), 11 deletions(-)

diffs (183 lines):

diff -r 05ed8db6b216 -r 875cada723d7 ChangeLog
--- a/ChangeLog	Wed Sep 28 23:07:52 2011 +0100
+++ b/ChangeLog	Fri Sep 30 04:33:46 2011 +0100
@@ -1,3 +1,55 @@
+2010-11-11  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	* Makefile.am: Upgrade CACAO version,
+	use .tar.gz archive
+
+2011-09-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Cleanup.
+
+2011-08-30  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	CACAO
+	- CA149: Used wrong class loader.
+	- src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke):
+	  [OPENJDK] stack index of caller was off by one, causing many apt
+	  (Annotation Processing Tool) failures.
+	* NEWS: Updated.
+	* Makefile.am
+	(CACAO_VERSION): Updated CACAO to 2011-08-29 revision.
+	(CACAO_SHA256SUM): Updated.
+
+2011-08-09  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	CACAO
+	- CA159: Exception handler blocks / register mixup.
+	- Set thread to RUNNABLE during Thread.start.
+	- Removed state-setting function call that would be done by the thread
+	  itself, creating a nasty race.
+	* NEWS: Updated.
+	* Makefile.am
+	(CACAO_VERSION): Updated CACAO to 2011-08-08 revision.
+	(CACAO_SHA256SUM): Updated.
+
+2010-11-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(CACAO_BASE_URL): Switch to using IcedTea
+	server for CACAO drops too.
+	(CACAO_URL): Likewise.
+
+2011-09-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_BOOT_PATCHES): Only apply
+	use_target_6_for_bootstrap_classes if 1.7
+	bytecode is not supported by the VM.  Fixes
+	bootstrap with IcedTea7.
+	* acinclude.m4:
+	(IT_BYTECODE7_CHECK): Check if the VM supports
+	1.7 bytecode.
+	* configure.ac: Call IT_BYTECODE7_CHECK.
+
 2011-09-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 05ed8db6b216 -r 875cada723d7 Makefile.am
--- a/Makefile.am	Wed Sep 28 23:07:52 2011 +0100
+++ b/Makefile.am	Fri Sep 30 04:33:46 2011 +0100
@@ -18,11 +18,11 @@
 LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
 
-CACAO_VERSION = d6264eb66506
-CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c
-CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive
-CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
-CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
+CACAO_VERSION = 4549072ab2de
+CACAO_SHA256SUM = ec097ce96f047abbaeab4faab752c121d29f08bdeae358038a0b7cde03361d07
+CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
+CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
 JAMVM_VERSION = 310c491ddc14e92a6ffff27030a1a1821e6395a8
 JAMVM_SHA256SUM = b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
@@ -318,8 +318,7 @@
 	patches/boot/ecj-multicatch.patch \
 	patches/boot/ecj-trywithresources.patch \
 	patches/boot/ecj-autoboxing.patch \
-	patches/boot/xsltproc.patch \
-	patches/boot/use_target_6_for_bootstrap_classes.patch 
+	patches/boot/xsltproc.patch
 
 if CP39408_JAVAH
 ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
@@ -364,6 +363,10 @@
 ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
 endif
 
+if NO_BYTECODE7
+ICEDTEA_BOOT_PATCHES +=	patches/boot/use_target_6_for_bootstrap_classes.patch 
+endif
+
 ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES)
 
 # OpenJDK build environment.
diff -r 05ed8db6b216 -r 875cada723d7 NEWS
--- a/NEWS	Wed Sep 28 23:07:52 2011 +0100
+++ b/NEWS	Fri Sep 30 04:33:46 2011 +0100
@@ -26,20 +26,25 @@
   - S7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
   - S7073913: Avoid random segfaults.
 * Zero/Shark
-  - PR757, 7066143: 7009309 regression: x86 stubRoutines
-  - PR753, 7066143: 7009923 regression
+  - PR757, S7066143: 7009309 regression: x86 stubRoutines
+  - PR753, S7066143: 7009923 regression
   - PR770: Zero 7033954 regression: missing mapfile
   - methodHandles_zero missing.
   - sharkContext typo in assert
   - sharedRuntime needs rework after indy reorg
   - Add missing describe_pd method for Zero.
+* CACAO
+  - CA149: Used wrong class loader.
+  - CA159: Exception handler blocks / register mixup.
+  - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): [OPENJDK] stack index of caller was off by one, causing many apt (Annotation Processing Tool) failures.
+  - Set thread to RUNNABLE during Thread.start.
+  - Removed state-setting function call that would be done by the thread itself, creating a nasty race.
 * JamVM
   - JamVM is self-hosting.
   - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit.
   - LP827463: Fix OpenJDK enclosingMethodInfo().
   - Add support for armhf.
-  - Skip Java-reflection-related DelegatingClassLoaders,
-    enables JamVM to run NetBeans.
+  - Skip Java-reflection-related DelegatingClassLoaders, enables JamVM to run NetBeans.
   - Generic JNI stubs for common JNI method signatures.
   - Fix memory heap arguments in terms of gigabytes.
   - armhf: ensure stack is 8 byte aligned.
diff -r 05ed8db6b216 -r 875cada723d7 acinclude.m4
--- a/acinclude.m4	Wed Sep 28 23:07:52 2011 +0100
+++ b/acinclude.m4	Fri Sep 30 04:33:46 2011 +0100
@@ -2146,3 +2146,35 @@
   AC_MSG_RESULT(${ALT_JAMVM_SRC_ZIP})
   AC_SUBST(ALT_JAMVM_SRC_ZIP)
 ])
+
+AC_DEFUN([IT_BYTECODE7_CHECK],[
+AC_CACHE_CHECK([if the VM lacks support for 1.7 bytecode], it_cv_bytecode7, [
+CLASS=Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+public class Test 
+{
+  public static void main(String[] args)
+  {
+  }
+}]
+EOF
+if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then
+  if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1 ; then
+    it_cv_bytecode7=no;
+  else
+    it_cv_bytecode7=yes;
+  fi
+else
+  it_cv_bytecode7=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
diff -r 05ed8db6b216 -r 875cada723d7 configure.ac
--- a/configure.ac	Wed Sep 28 23:07:52 2011 +0100
+++ b/configure.ac	Fri Sep 30 04:33:46 2011 +0100
@@ -118,6 +118,7 @@
 IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
 IT_CHECK_ENABLE_WARNINGS
 IT_DIAMOND_CHECK
+IT_BYTECODE7_CHECK
 
 IT_FIND_RHINO_JAR
 IT_WITH_OPENJDK_SRC_ZIP

More information about the distro-pkg-dev mailing list