/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 9560facaefcc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9560facaefcc
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Thu Nov 11 21:25:15 2010 +0000

	CACAO: adapted arm-arch-defines.patch

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

	 * patches/cacao/arm-arch-defines.patch: Adapted to new Boehm
	GC version.


changeset 5772aff6fc53 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5772aff6fc53
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Thu Nov 11 21:01:13 2010 +0100

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


diffstat:

3 files changed, 13 insertions(+), 22 deletions(-)
ChangeLog                            |    9 +++++++++
Makefile.am                          |    8 ++++----
patches/cacao/arm-arch-defines.patch |   18 ------------------

diffs (60 lines):

diff -r cb572d31894b -r 5772aff6fc53 ChangeLog
--- a/ChangeLog	Thu Nov 11 21:15:23 2010 +0000
+++ b/ChangeLog	Thu Nov 11 21:01:13 2010 +0100
@@ -1,3 +1,12 @@ 2010-11-11  Pavel Tisnovsky  <ptisnovs at r
+2010-11-11  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	* Makefile.am: Upgrade CACAO version, use .tar.gz archive
+
+2010-11-11  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	* patches/cacao/arm-arch-defines.patch:
+	Adapted to new Boehm GC version.
+
 2010-11-11  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r cb572d31894b -r 5772aff6fc53 Makefile.am
--- a/Makefile.am	Thu Nov 11 21:15:23 2010 +0000
+++ b/Makefile.am	Thu Nov 11 21:01:13 2010 +0100
@@ -5,11 +5,11 @@ OPENJDK_VERSION = b20
 OPENJDK_VERSION = b20
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
-CACAO_VERSION = e321b101a9ee
-CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
+CACAO_VERSION = 6a5eda011e49
+CACAO_SHA256SUM = 57f3abd73688cb8861875e2f21be9ec8a0c7c234e1e694489e3efa4436e9228c
 CACAO_BASE_URL = http://mips.complang.tuwien.ac.at
-CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
-CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
+CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.gz
+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
 JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
 JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip
diff -r cb572d31894b -r 5772aff6fc53 patches/cacao/arm-arch-defines.patch
--- a/patches/cacao/arm-arch-defines.patch	Thu Nov 11 21:15:23 2010 +0000
+++ b/patches/cacao/arm-arch-defines.patch	Thu Nov 11 21:01:13 2010 +0100
@@ -1,21 +1,3 @@ diff -Nru cacao.orig/cacao/src/mm/boehm-
-diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
---- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-06-21 18:35:53.000000000 +0100
-@@ -33,7 +33,13 @@
- 
- /* NEC LE-IT: gcc has no way to easily check the arm architecture
-  * but defines only one of __ARM_ARCH_x__ to be true			*/
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_7__)  
-+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-+	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
-+	|| defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
-+	|| defined(__ARM_ARCH_6M__) \
-+	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-+	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
-+
- AO_INLINE void
- AO_nop_full()
- {
 diff -Nru cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp cacao/cacao/src/vm/jit/arm/md-atomic.hpp
 --- cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp	2010-05-19 12:14:46.000000000 +0100
 +++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp	2010-06-21 18:35:53.000000000 +0100