/hg/icedtea6: 2 new changesets

Tue Nov 6 07:19:10 PST 2012

changeset 849f72a5a514 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=849f72a5a514
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Mon Nov 05 16:53:59 2012 +0100

	PR1120: Upgrade CACAO to 2012-11-04 version

	Changes:
	- Unified version for icedtea6/7
	- CA166, CA167: check-langtools fixes for icedtea6
	- Implemented sun.misc.Perf.highResCounter
	- CACAO now identifies by its own Mercurial revision
	- Some memory barrier maintenance
	- Ability to run when compiled as Thumb on armv5 (no Thumb JIT though)

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

	* Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated.
	(ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch.
	(stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM.
	* patches/cacao/jsig.patch: Removed.


changeset 1793e2fb84c5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1793e2fb84c5
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue Nov 06 18:28:55 2012 +0100

	CACAO: PR1120: Added ChangeLog entry, updated NEWS and HACKING.

	2012-11-06  Xerxes Ranby  <xerxes at zafena.se>
		    Stefan Ring  <stefan at complang.tuwien.ac.at>

		* Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated.
		(ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch.
		(stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM.
		* patches/cacao/jsig.patch: Removed.
		* HACKING: Updated.
		* NEWS: Updated.


diffstat:

 ChangeLog                |  10 ++++++++++
 HACKING                  |   6 +++---
 Makefile.am              |   7 ++++---
 NEWS                     |   7 +++++++
 patches/cacao/jsig.patch |  18 ------------------
 5 files changed, 24 insertions(+), 24 deletions(-)

diffs (110 lines):

diff -r 8f6318c8c2f4 -r 1793e2fb84c5 ChangeLog

--- a/ChangeLog	Thu Nov 01 14:03:48 2012 -0400
+++ b/ChangeLog	Tue Nov 06 18:28:55 2012 +0100
@@ -1,3 +1,13 @@
+2012-11-06  Xerxes RÃ¥nby  <xerxes at zafena.se>
+	    Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	* Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated.
+	(ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch.
+	(stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM.
+	* patches/cacao/jsig.patch: Removed.
+	* HACKING: Updated.
+	* NEWS: Updated.
+
 2012-11-01  Lukas Berk  <lberk at redhat.com>
 
 	* Makefile.am:
diff -r 8f6318c8c2f4 -r 1793e2fb84c5 HACKING
--- a/HACKING	Thu Nov 01 14:03:48 2012 -0400
+++ b/HACKING	Tue Nov 06 18:28:55 2012 +0100
@@ -89,9 +89,6 @@
 * icedtea-java2d-mitre-join.patch: Backport fix for mitre join decoration (S6812600).
 * icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath().
 * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath().
-* icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM.
-* icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page.
-* cacao/no-strict-aliasing.patch: Turn off strict aliasing which causes an issue with the verifier when building with GCC 4.4 (cacao PR129).
 * icedtea-shark.patch: Add support for the Shark JIT.
 * icedtea-xshm.patch: Support newer X11 headers for awt_GraphicsEnv.h.
 
@@ -138,6 +135,9 @@
 
 The following patches are only applied when building with the CACAO virtual machine:
 
+* cacao/launcher.patch: For the 'java' command, create new thread depending on the current VM.
+* cacao/memory.patch: Increase memory while building langtools for cacao builds.
+
 The following patches are to support Xrender pipeline (-Dsun.java2d.xrender):
 
 * icedtea-xrender-xxx.patch: Numbered patches from xrender branch
diff -r 8f6318c8c2f4 -r 1793e2fb84c5 Makefile.am
--- a/Makefile.am	Thu Nov 01 14:03:48 2012 -0400
+++ b/Makefile.am	Tue Nov 06 18:28:55 2012 +0100
@@ -5,8 +5,8 @@
 OPENJDK_VERSION = b27
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
-CACAO_VERSION = cff92704c4e0
-CACAO_SHA256SUM = dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f
+CACAO_VERSION = 9968abd511a3
+CACAO_SHA256SUM = 3b1ce9d2205d2afba4614a194484341758ee2cb340396310ac2c00e5a2a20955
 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
@@ -433,7 +433,6 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
-	patches/cacao/jsig.patch \
 	patches/cacao/memory.patch
 endif
 
@@ -2136,6 +2135,8 @@
 	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
 	$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
 	ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
+	touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
+	ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
 endif
 endif
 	mkdir -p stamps
diff -r 8f6318c8c2f4 -r 1793e2fb84c5 NEWS
--- a/NEWS	Thu Nov 01 14:03:48 2012 -0400
+++ b/NEWS	Tue Nov 06 18:28:55 2012 +0100
@@ -56,6 +56,13 @@
     are actually missing from the boot JDK
   - PR1114: Provide option to turn off downloading of tarballs (--disable-downloading)
   - PR1176: Synchronise CACAO rules between IcedTea6/7/8 where possible
+* CACAO
+  - PR1120: Unified version for icedtea6/7
+  - CA166, CA167: check-langtools fixes for icedtea6
+  - Implemented sun.misc.Perf.highResCounter
+  - CACAO now identifies by its own Mercurial revision
+  - Some memory barrier maintenance
+  - Ability to run when compiled as Thumb on armv5 (no Thumb JIT though) 
 * JamVM
   - ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
   - PPC: Don't use lwsync if it isn't supported
diff -r 8f6318c8c2f4 -r 1793e2fb84c5 patches/cacao/jsig.patch
--- a/patches/cacao/jsig.patch	Thu Nov 01 14:03:48 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -Nru cacao.orig/Makefile.am cacao/Makefile.am
---- cacao.orig/cacao/src/cacao/Makefile.am	2008-08-04 17:51:28.000000000 +0100
-+++ cacao/cacao/src/cacao/Makefile.am	2010-05-11 10:29:35.000000000 +0100
-@@ -96,12 +96,12 @@
- 	$(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
- 	$(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
- 	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
--	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
-+	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
- 
- uninstall-local:
- 	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
- 	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
--	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
-+	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
- endif
- 
- 

