Mercurial > hg > release > icedtea6-1.3

changeset 769:2b413b0a984f cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fixes after transplant and changes for merge.
author Christian Thalinger <twisti@complang.tuwien.ac.at>
date Mon, 17 Mar 2008 16:00:18 +0100
parents b96db45c4913
children 162a0882c704
files ChangeLog Makefile.am Makefile.in README README.cacao acinclude.m4 aclocal.m4 configure configure.ac
diffstat 9 files changed, 186 insertions(+), 196 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 17 08:48:42 2008 -0400
+++ b/ChangeLog	Mon Mar 17 16:00:18 2008 +0100
@@ -87,11 +87,6 @@
 
 2008-03-11  Lillian Angel  <langel@redhat.com>
 
-	* configure: Regenerated.
-	* configure.ac: Added conditional for WITH_OPENJDK.
-
-2008-03-11  Lillian Angel  <langel@redhat.com>
-
 	* Makefile.am: Added check for WITH_OPENJDK.
 	* Makefile.in: Regenerated.
 	* configure: Regenerated.
@@ -2120,10 +2115,6 @@
 	patch.
 	* tools-copy-files.txt: Removed.
 
-2007-11-07  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* Makefile.in: Regenerated after transplanting.
-
 2007-11-07  Gary Benson  <gbenson@redhat.com>
 
 	* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
@@ -2173,12 +2164,6 @@
 	create OpenJDK's libjpeg.so without files common to the system
 	installed libjpeg.so.
 
-2007-10-23  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* j2se/make/common/Defs-linux.gmk: Updated for b22.
-	* j2se/make/common/shared/Platform.gmk: Likewise.
-	* j2se/src/share/bin/java.c: Likewise.
-
 2007-10-22  Lillian Angel  <langel@redhat.com>
 
 	* configure.ac: Fixed typo. libgif should be giflib.
@@ -2213,12 +2198,6 @@
 
 	* README: Updated.
 
-2007-10-17  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* Makefile.in: Regenerated (I was too lazy to merge all
-	conflicts).
-	* configure: Likewise.
-
 2007-10-16  Francis Kung  <fkung@redhat.com>
 
 	* patches/icedtea-paths.patch: Add Classpath copyright notice.
@@ -2432,34 +2411,11 @@
 	* Makefile.am (ICEDTEA_PATCHES):  Add above patch.
 	* Makefile.in: Regenerated.
 
-2007-09-18  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* patches/icedtea-cacao-jvm-cfg.patch: Added
-	j2se/src/solaris/bin/ppc/jvm.cfg.
-
-2007-09-16  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* Makefile.am [WITH_CACAO] (ICEDTEA_ENV): Set
-	ALT_HOTSPOT_IMPORT_PATH and ALT_JDK_IMPORT_PATH to CACAO
-	directory.
-	* Makefile.in: Regenerated.
-
-2007-09-16  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* Makefile.am (ICEDTEA_PATCHES): Added
-	patches/icedtea-cacao-docs-Makefile.patch.
-	* Makefile.in: Regenerated.
-	* patches/icedtea-cacao-docs-Makefile.patch: New file.
-
 2007-09-14  Keith Seitz  <keiths@redhat.com>
 
 	* configure.ac: Added check for libXtst.
 	* configure: Regenerated.
 
-2007-09-13  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* patches/icedtea-cacao-instrument-Makefile.patch: New file.
-
 2007-09-13  Lillian Angel  <langel@redhat.com>
 
 	* Makefile.am: Added JRE_RELEASE_VERSION and
@@ -2477,24 +2433,6 @@
 
 2007-09-12  Christan Thalinger  <twisti@complang.tuwien.ac.at>
 
-	* Makefile.am: Added WITH_CACAO stuff.
-	* Makefile.in: Regenerated.
-	* acinclude.m4 (AC_CHECK_WITH_CACAO): New function.
-	* configure.ac (AC_CHECK_WITH_CACAO): Added.
-	* configure: Regenerated.
-	* patches/icedtea-cacao-Compiler-gcc-gmk.patch,
-	patches/icedtea-cacao-Defs-linux-gmk.patch,
-	patches/icedtea-cacao-Platform-gmk.patch,
-	patches/icedtea-cacao-Program-gmk.patch,
-	patches/icedtea-cacao-java-c.patch,
-	patches/icedtea-cacao-jvm-cfg.patch: New file.
-
-2007-09-12  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
-	* README.cacao: New file.
-
-2007-09-12  Christan Thalinger  <twisti@complang.tuwien.ac.at>
-
 	* Makefile.am (icedtea-debug): Added -debug to target directory,
 	as found today by Andrew Haley.
 	* Makefile.in: Likewise.
@@ -2512,7 +2450,7 @@
 	* Makefile.am: Added BUILD_NUMBER to environment. This should be
 	updated with each bXX release. Also, added dependency for
 	icedtea-debug target.
-	* Makefile.in: Regenerate.
+	* Makefile.in: Regenerated.
 
 2007-09-12  Joshua Sumali  <jsumali@redhat.com>
 
--- a/Makefile.am	Mon Mar 17 08:48:42 2008 -0400
+++ b/Makefile.am	Mon Mar 17 16:00:18 2008 +0100
@@ -40,7 +40,8 @@
 
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
-	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES)
+	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
+	patches/icedtea-cacao.patch
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
 # name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -514,6 +515,14 @@
   MEMORY_LIMIT =
 endif
 
+if WITH_CACAO
+  ICEDTEA_BUILD_TARGET=j2se_only
+  ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only
+else
+  ICEDTEA_BUILD_TARGET=
+  ICEDTEA_DEBUG_BUILD_TARGET=debug_build
+endif
+
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 icedtea: stamps/bootstrap-directory-symlink.stamp \
@@ -522,7 +531,8 @@
 	extra-lib/about.jar
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
-	  -C openjdk/control/make/
+	  -C openjdk/control/make/ \
+	  $(ICEDTEA_BUILD_TARGET)
 	if test "$(ENABLE_PLUGIN)" == "yes" ; \
 	  then \
 	  cp -pPRf gcjwebplugin.so \
@@ -545,7 +555,7 @@
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make \
-	  debug_build
+	  $(ICEDTEA_DEBUG_BUILD_TARGET)
 	if test "$(ENABLE_PLUGIN)" == "yes" ; \
 	  then \
 	  cp -pPRf gcjwebplugin.so \
@@ -578,7 +588,8 @@
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
-	  -C openjdk-ecj/control/make
+	  -C openjdk-ecj/control/make \
+	  $(ICEDTEA_BUILD_TARGET)
 	@echo "ecj-poured IcedTea is served:" \
 	  openjdk-ecj/control/build/$(LINUX_DIR)
 	mkdir -p stamps
--- a/Makefile.in	Mon Mar 17 08:48:42 2008 -0400
+++ b/Makefile.in	Mon Mar 17 16:00:18 2008 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -235,7 +235,8 @@
 @NETX_PLUGIN_TRUE@NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
-	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES)
+	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
+	patches/icedtea-cacao.patch
 
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
@@ -253,16 +254,22 @@
 ICEDTEA_CLS_DIR = \
 	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
 
+ICEDTEA_BOOT_DIR = \
+	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+
 ICEDTEA_ENDORSED_DIR = \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
+	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 
-ICEDTEA_ENV =  \
-	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
+@CORE_BUILD_FALSE@ICEDTEA_CORE_BUILD = 
+@CORE_BUILD_TRUE@ICEDTEA_CORE_BUILD = yes
+@ZERO_BUILD_FALSE@ICEDTEA_ZERO_BUILD = 
+@ZERO_BUILD_TRUE@ICEDTEA_ZERO_BUILD = yes
+ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
+	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
+	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -270,22 +277,30 @@
 	"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
 	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	"CLASSPATH=" "LD_LIBRARY_PATH=" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_1)
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+	"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+	"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+	"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+	"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+	"FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/
+	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
 
 ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes
+	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 
-ICEDTEA_ENV_ECJ =  \
-	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
+ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
+	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
+	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -299,7 +314,16 @@
 	"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
 	$(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
-	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_2)
+	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+	"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+	"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+	"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+	"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+	"FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
 
 # OpenJDK Source Preparation Targets
 # ==================================
@@ -312,15 +336,34 @@
 
 # Patch OpenJDK sources for plug replacements.
 @FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch
-ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
-	patches/icedtea-version.patch \
+@GCC_OLD_FALSE@GCC_PATCH = patches/icedtea-gcc-4.3.patch
+
+# If new gcc is installed, apply 4.3 patch
+@GCC_OLD_TRUE@GCC_PATCH = 
+
+# If ZERO_BUILD is set then we are building zero and need
+# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
+ZERO_PATCHES = \
+	patches/icedtea-hotspot-6b06-7b24.patch \
+	patches/icedtea-hotspot7-build-fixes.patch \
+	patches/icedtea-bytecodeInterpreter.patch \
+	patches/icedtea-bytecodeInterpreterWithChecks.patch \
+	patches/icedtea-signature-iterator.patch \
+	patches/icedtea-signed-types.patch \
+	patches/icedtea-test-atomic-operations.patch \
+	patches/icedtea-zero.patch
+
+@ZERO_BUILD_FALSE@ZERO_PATCHES_COND = 
+@ZERO_BUILD_TRUE@ZERO_PATCHES_COND = $(ZERO_PATCHES)
+ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
+	patches/icedtea-copy-plugs.patch patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
-	patches/icedtea-graphics.patch patches/icedtea-paths.patch \
-	patches/icedtea-debuginfo.patch patches/icedtea-ssl.patch \
+	patches/icedtea-graphics.patch patches/icedtea-debuginfo.patch \
+	patches/icedtea-ssl.patch \
 	patches/icedtea-license-headers.patch \
-	patches/icedtea-plugin.patch patches/icedtea-rmi_amd64.patch \
-	patches/icedtea-tools.patch patches/icedtea-certbundle.patch \
-	patches/icedtea-demos.patch \
+	patches/icedtea-webservices.patch $(NETX_PATCH) \
+	patches/icedtea-rmi_amd64.patch patches/icedtea-tools.patch \
+	patches/icedtea-certbundle.patch patches/icedtea-demos.patch \
 	patches/icedtea-use-system-tzdata.patch \
 	patches/icedtea-headers.patch patches/icedtea-ant.patch \
 	patches/icedtea-gcc-suffix.patch \
@@ -329,32 +372,37 @@
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-sunsrc.patch patches/icedtea-libraries.patch \
-	patches/icedtea-javafiles.patch \
-	patches/icedtea-corba.patch \
-	patches/icedtea-signature-iterator.patch \
-	patches/icedtea-signed-types.patch \
-	patches/icedtea-test-atomic-operations.patch \
+	patches/icedtea-javafiles.patch patches/icedtea-corba.patch \
 	patches/icedtea-core-build.patch \
 	patches/icedtea-linker-options.patch \
-	patches/icedtea-ports.patch patches/icedtea-lcms-leak.patch \
-	patches/icedtea-c1-unimplemented.patch \
+	patches/icedtea-ports.patch \
+	patches/icedtea-static-libstdc++.patch \
+	patches/icedtea-lcms-leak.patch \
 	patches/icedtea-timerqueue.patch \
-	patches/icedtea-jnlp-launcher.patch \
+	patches/icedtea-lesstif-64.patch \
 	patches/icedtea-generated.patch patches/icedtea-lib64.patch \
-	$(am__append_3)
+	patches/icedtea-zero-build.patch \
+	patches/icedtea-print-lsb-release.patch $(GCC_PATCH) \
+	$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
-@WITH_ICEDTEA_FALSE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
-@WITH_ICEDTEA_TRUE@BOOTSTRAP_DIRECTORY_STAMP = 
-@WITH_ICEDTEA_FALSE@ICEDTEA_HOME = icedtea
-@WITH_ICEDTEA_TRUE@ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
+@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE@BOOTSTRAP_DIRECTORY_STAMP = 
+@WITH_OPENJDK_TRUE@BOOTSTRAP_DIRECTORY_STAMP = 
+@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE@ICEDTEA_HOME = icedtea
+@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE@ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+@WITH_OPENJDK_TRUE@ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
 @WITH_CACAO_FALSE@@WITH_ICEDTEA_TRUE@MEMORY_LIMIT = -J-Xmx512m
 
 # OpenJDK Targets
 # ===============
 @WITH_CACAO_TRUE@@WITH_ICEDTEA_TRUE@MEMORY_LIMIT = -J-Xmx1024m
 @WITH_ICEDTEA_FALSE@MEMORY_LIMIT = 
+@WITH_CACAO_FALSE@ICEDTEA_BUILD_TARGET = 
+@WITH_CACAO_TRUE@ICEDTEA_BUILD_TARGET = j2se_only
+@WITH_CACAO_FALSE@ICEDTEA_DEBUG_BUILD_TARGET = debug_build
+@WITH_CACAO_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = j2se_fastdebug_only
 
 # Shared objects.
 SHARED_OBJECT_FILES = \
@@ -476,6 +524,10 @@
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -502,6 +554,8 @@
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -645,17 +699,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local am--refresh check check-am clean \
-	clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-local distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am
+	clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-local distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 # Top-Level Targets
@@ -939,7 +993,8 @@
 	extra-lib/about.jar
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
-	  -C openjdk/ j2se_only
+	  -C openjdk/control/make/ \
+	  $(ICEDTEA_BUILD_TARGET)
 	if test "$(ENABLE_PLUGIN)" == "yes" ; \
 	  then \
 	  cp -pPRf gcjwebplugin.so \
@@ -961,8 +1016,8 @@
 	extra-lib/about.jar
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
-	  -C openjdk/ \
-	  j2se_fastdebug_only
+	  -C openjdk/control/make \
+	  $(ICEDTEA_DEBUG_BUILD_TARGET)
 	if test "$(ENABLE_PLUGIN)" == "yes" ; \
 	  then \
 	  cp -pPRf gcjwebplugin.so \
@@ -995,7 +1050,8 @@
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
-	  -C openjdk-ecj/control/make
+	  -C openjdk-ecj/control/make \
+	  $(ICEDTEA_BUILD_TARGET)
 	@echo "ecj-poured IcedTea is served:" \
 	  openjdk-ecj/control/build/$(LINUX_DIR)
 	mkdir -p stamps
--- a/README	Mon Mar 17 08:48:42 2008 -0400
+++ b/README	Mon Mar 17 16:00:18 2008 +0100
@@ -124,3 +124,11 @@
 certificate storing, system certificate store checking, and provides
 some services specified by the jnlp API.
 
+CACAO as VM
+===========
+
+The --with-cacao configure option replaces the libjvm.so from Sun's
+HotSpot with the one from the CACAO VM.  This enables the usage of
+IcedTea on architectures which are not supported by the HotSpot VM,
+besides the HotSpot zero port.  In contrast to the HotSpot zero port,
+CACAO provides a Just-In-Time compiler for various architectures.
--- a/README.cacao	Mon Mar 17 08:48:42 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-IcedTea with CACAO as VM
-========================
-
-TODO
--- a/acinclude.m4	Mon Mar 17 08:48:42 2008 -0400
+++ b/acinclude.m4	Mon Mar 17 16:00:18 2008 +0100
@@ -607,8 +607,6 @@
   ])
 ])
 
-
-
 AC_DEFUN([AC_CHECK_WITH_CACAO],
 [
   AC_MSG_CHECKING(whether to use CACAO as VM)
--- a/aclocal.m4	Mon Mar 17 08:48:42 2008 -0400
+++ b/aclocal.m4	Mon Mar 17 16:00:18 2008 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
@@ -164,7 +167,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -174,7 +177,7 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -189,7 +192,7 @@
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -205,8 +208,10 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -478,7 +483,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -526,13 +531,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -637,16 +642,17 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -935,7 +941,7 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
--- a/configure	Mon Mar 17 08:48:42 2008 -0400
+++ b/configure	Mon Mar 17 16:00:18 2008 +0100
@@ -7236,7 +7236,6 @@
     XERCES2_JAR=
 
 fi
-fi
 
   if test -z "${XERCES2_JAR}"; then
     { echo "$as_me:$LINENO: checking for xerces2 jar" >&5
@@ -10397,17 +10396,17 @@
 
 	{ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                MOZILLA_FOUND=no
+                \
+  MOZILLA_FOUND=no
 elif test $pkg_failed = untried; then
-	MOZILLA_FOUND=no
+	\
+  MOZILLA_FOUND=no
 else
 	MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
 	MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-	\
-    MOZILLA_FOUND=yes
-fi
+	MOZILLA_FOUND=yes
 fi
 if test "x${MOZILLA_FOUND}" = xno
 then
@@ -10472,17 +10471,17 @@
 
 	{ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                \
-  MOZILLA_FOUND=no
+                MOZILLA_FOUND=no
 elif test $pkg_failed = untried; then
-	\
-  MOZILLA_FOUND=no
+	MOZILLA_FOUND=no
 else
 	MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
 	MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-	MOZILLA_FOUND=yes
+	\
+    MOZILLA_FOUND=yes
+fi
 fi
 if test "x${MOZILLA_FOUND}" = xno
 then
@@ -10957,7 +10956,7 @@
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -10967,7 +10966,7 @@
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -11068,7 +11067,7 @@
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -11078,7 +11077,7 @@
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -11596,13 +11595,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${GCC_OLD_TRUE}" && test -z "${GCC_OLD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"GCC_OLD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GCC_OLD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${USE_ALT_OPENJDK_SRC_ZIP_TRUE}" && test -z "${USE_ALT_OPENJDK_SRC_ZIP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"USE_ALT_OPENJDK_SRC_ZIP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -11638,6 +11630,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${FAST_BUILD_TRUE}" && test -z "${FAST_BUILD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"FAST_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FAST_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${ZERO_BUILD_TRUE}" && test -z "${ZERO_BUILD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"ZERO_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ZERO_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${NETX_PLUGIN_TRUE}" && test -z "${NETX_PLUGIN_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"NETX_PLUGIN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -11652,13 +11658,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${ZERO_BUILD_TRUE}" && test -z "${ZERO_BUILD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ZERO_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ZERO_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${CORE_BUILD_TRUE}" && test -z "${CORE_BUILD_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"CORE_BUILD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -11666,27 +11665,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${CORE_BUILD_TRUE}" && test -z "${CORE_BUILD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CORE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CORE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${CORE_BUILD_TRUE}" && test -z "${CORE_BUILD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CORE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CORE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${FAST_BUILD_TRUE}" && test -z "${FAST_BUILD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"FAST_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FAST_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -12426,7 +12404,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -12748,7 +12726,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
--- a/configure.ac	Mon Mar 17 08:48:42 2008 -0400
+++ b/configure.ac	Mon Mar 17 16:00:18 2008 +0100
@@ -174,7 +174,6 @@
   AC_CONFIG_FILES([javap], [chmod +x javap])
 fi
 fi
-fi
 WITH_OPENJDK_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 AC_CHECK_WITH_CACAO