merging cacao branch to default
Christian Thalinger
twisti at complang.tuwien.ac.at
Mon Mar 17 09:02:03 PDT 2008
On Mon, 2008-03-17 at 14:35 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > This was for the icedtea repository only. But I want to do the
> > same for icedtea6. Is that OK too?
>
> Sure, but could you mail a patch to this list before you commit
> please?
Of course, here it is. It's more or less the same as for icedtea.
- twisti
---
diff -r d7f8439ac6db Makefile.am
--- a/Makefile.am Mon Mar 17 08:48:42 2008 -0400
+++ b/Makefile.am Mon Mar 17 16:59:41 2008 +0100
@@ -40,7 +40,8 @@ install:
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.
@@ -98,6 +99,11 @@ ICEDTEA_ENV = \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)"
+if WITH_CACAO
+ICEDTEA_ENV += \
+ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+endif
+
env:
@echo 'unset JAVA_HOME'
@echo 'export $(ICEDTEA_ENV)'
@@ -142,6 +148,11 @@ ICEDTEA_ENV_ECJ = \
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)"
+
+if WITH_CACAO
+ICEDTEA_ENV_ECJ += \
+ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+endif
env-ecj:
@echo 'unset JAVA_HOME'
@@ -266,6 +277,11 @@ ICEDTEA_PATCHES = \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
+if WITH_CACAO
+ICEDTEA_PATCHES += \
+ patches/icedtea-cacao.patch
+endif
+
stamps/extract.stamp: stamps/download.stamp
if ! test -d openjdk ; \
then \
@@ -490,9 +506,21 @@ clean-bootstrap-directory-symlink-ecj:
# ===============
if WITH_ICEDTEA
+if WITH_CACAO
+ MEMORY_LIMIT = -J-Xmx1024m
+else
MEMORY_LIMIT = -J-Xmx512m
+endif
else
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
@@ -503,7 +531,8 @@ icedtea: stamps/bootstrap-directory-syml
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 \
@@ -526,7 +555,7 @@ icedtea-debug: stamps/bootstrap-director
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
- debug_build
+ $(ICEDTEA_DEBUG_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
cp -pPRf gcjwebplugin.so \
@@ -559,7 +588,8 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
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
diff -r d7f8439ac6db Makefile.in
--- a/Makefile.in Mon Mar 17 08:48:42 2008 -0400
+++ b/Makefile.in Mon Mar 17 16:59:41 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.
@@ -31,6 +31,15 @@ POST_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+ at WITH_CACAO_TRUE@am__append_1 = \
+ at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+
+ at WITH_CACAO_TRUE@am__append_2 = \
+ at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+
+ at WITH_CACAO_TRUE@am__append_3 = \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao.patch
+
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/javac.in $(srcdir)/javap.in \
@@ -69,6 +78,7 @@ AUTOMAKE = @AUTOMAKE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
+CACAO = @CACAO@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -225,7 +235,8 @@ OPENJDK_VERSION = b06
@NETX_PLUGIN_TRUE at 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,24 +264,19 @@ ICEDTEA_ENDORSED_DIR = \
@CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
@ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD =
@ZERO_BUILD_TRUE at 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.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "LANG=C" \
+ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
+ "ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
+ "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=$(ICEDTEA_BOOT_DIR)" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
- "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
- "ICEDTEA_RT=$(ICEDTEA_RT)" \
+ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
- "CLASSPATH=" \
- "LD_LIBRARY_PATH=" \
+ "CLASSPATH=" "LD_LIBRARY_PATH=" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
@@ -278,11 +284,9 @@ ICEDTEA_ENV = \
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)"
-
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
@@ -291,29 +295,24 @@ ICEDTEA_CLS_DIR_ECJ = \
ICEDTEA_CLS_DIR_ECJ = \
$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
-ICEDTEA_ENV_ECJ = \
- "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
- "ANT_HOME=$(SYSTEM_ANT_DIR)" \
- "BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "LANG=C" \
+ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
+ "ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
+ "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=$(ICEDTEA_BOOT_DIR)" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
- "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
- "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
+ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \
"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"BOOTCLASSPATH_CLS_RT=-bootclasspath \
- $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
+ $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
- "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):
$(LIBGCJ_JAR)" \
- "CLASSPATH=" \
- "LD_LIBRARY_PATH=" \
+ "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
+ $(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_srcdir)/generated" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
@@ -322,11 +321,9 @@ ICEDTEA_ENV_ECJ = \
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)"
-
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
# OpenJDK Source Preparation Targets
# ==================================
@@ -358,33 +355,24 @@ ZERO_PATCHES = \
@ZERO_BUILD_FALSE at ZERO_PATCHES_COND =
@ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
-ICEDTEA_PATCHES = \
- $(ZERO_PATCHES_COND) \
- patches/icedtea-copy-plugs.patch \
- patches/icedtea-version.patch \
+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-debuginfo.patch \
+ patches/icedtea-graphics.patch patches/icedtea-debuginfo.patch \
patches/icedtea-ssl.patch \
patches/icedtea-license-headers.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-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-headers.patch patches/icedtea-ant.patch \
patches/icedtea-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/icedtea-float-double-trailing-zeros.patch \
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-sunsrc.patch patches/icedtea-libraries.patch \
+ patches/icedtea-javafiles.patch patches/icedtea-corba.patch \
patches/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
patches/icedtea-ports.patch \
@@ -392,14 +380,10 @@ ICEDTEA_PATCHES = \
patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
patches/icedtea-lesstif-64.patch \
- patches/icedtea-generated.patch \
- patches/icedtea-lib64.patch \
+ patches/icedtea-generated.patch patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch \
- $(GCC_PATCH) \
- $(FAST_BUILD_PATCH) \
- $(DISTRIBUTION_PATCHES)
-
+ 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
@@ -409,11 +393,16 @@ ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.
@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at ICEDTEA_HOME = icedtea
@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at ICEDTEA_HOME =
$(SYSTEM_ICEDTEA_DIR)
@WITH_OPENJDK_TRUE at ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
- at WITH_ICEDTEA_FALSE@MEMORY_LIMIT =
+ at WITH_CACAO_FALSE@@WITH_ICEDTEA_TRUE at MEMORY_LIMIT = -J-Xmx512m
# OpenJDK Targets
# ===============
- at WITH_ICEDTEA_TRUE@MEMORY_LIMIT = -J-Xmx512m
+ at WITH_CACAO_TRUE@@WITH_ICEDTEA_TRUE at MEMORY_LIMIT = -J-Xmx1024m
+ at WITH_ICEDTEA_FALSE@MEMORY_LIMIT =
+ at WITH_CACAO_FALSE@ICEDTEA_BUILD_TARGET =
+ at WITH_CACAO_TRUE@ICEDTEA_BUILD_TARGET = j2se_only
+ at WITH_CACAO_FALSE@ICEDTEA_DEBUG_BUILD_TARGET = debug_build
+ at WITH_CACAO_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = j2se_fastdebug_only
# Shared objects.
SHARED_OBJECT_FILES = \
@@ -535,6 +524,10 @@ dist-bzip2: distdir
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)
@@ -561,6 +554,8 @@ distcheck: dist
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*) \
@@ -704,17 +699,17 @@ uninstall-am:
.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
@@ -998,7 +993,8 @@ icedtea: stamps/bootstrap-directory-syml
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 \
@@ -1021,7 +1017,7 @@ icedtea-debug: stamps/bootstrap-director
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
- debug_build
+ $(ICEDTEA_DEBUG_BUILD_TARGET)
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
cp -pPRf gcjwebplugin.so \
@@ -1054,7 +1050,8 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
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
diff -r d7f8439ac6db README
--- a/README Mon Mar 17 08:48:42 2008 -0400
+++ b/README Mon Mar 17 16:59:41 2008 +0100
@@ -124,3 +124,11 @@ certificate storing, system certificate
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.
diff -r d7f8439ac6db acinclude.m4
--- a/acinclude.m4 Mon Mar 17 08:48:42 2008 -0400
+++ b/acinclude.m4 Mon Mar 17 16:59:41 2008 +0100
@@ -607,3 +607,29 @@ AC_DEFUN([ENABLE_NETX_PLUGIN],
])
])
+AC_DEFUN([AC_CHECK_WITH_CACAO],
+[
+ AC_MSG_CHECKING(whether to use CACAO as VM)
+ AC_ARG_WITH([cacao],
+ [AS_HELP_STRING(--with-cacao,use CACAO as VM)],
+ [
+ case "${withval}" in
+ yes)
+ CACAO=/usr/local/cacao
+ ;;
+ no)
+ CACAO=no
+ ;;
+ *)
+ CACAO=${withval}
+ ;;
+ esac
+ ],
+ [
+ CACAO=no
+ ])
+
+ AC_MSG_RESULT(${CACAO})
+ AM_CONDITIONAL(WITH_CACAO, test x"${CACAO}" != "xno")
+ AC_SUBST(CACAO)
+])
diff -r d7f8439ac6db aclocal.m4
--- a/aclocal.m4 Mon Mar 17 08:48:42 2008 -0400
+++ b/aclocal.m4 Mon Mar 17 16:59:41 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 -*-
#
@@ -174,7 +177,7 @@ fi[]dnl
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 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[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 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# 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 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
# 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 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
# 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 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# 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 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _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])
diff -r d7f8439ac6db configure
--- a/configure Mon Mar 17 08:48:42 2008 -0400
+++ b/configure Mon Mar 17 16:59:41 2008 +0100
@@ -745,6 +745,9 @@ OPENJDK_SRC_DIR
OPENJDK_SRC_DIR
GNU_CLASSLIB_FOUND_TRUE
GNU_CLASSLIB_FOUND_FALSE
+WITH_CACAO_TRUE
+WITH_CACAO_FALSE
+CACAO
FAST_BUILD_TRUE
FAST_BUILD_FALSE
ZERO_BUILD_TRUE
@@ -1444,6 +1447,7 @@ Optional Packages:
--with-xerces2-jar specify location of the xerces2 jar
--with-openjdk-src-zip specify the location of the openjdk source
zip
--with-openjdk-src-dir specify the location of the openjdk sources
+ --with-cacao use CACAO as VM
Some influential environment variables:
CC C compiler command
@@ -7337,6 +7341,44 @@ fi
+ { echo "$as_me:$LINENO: checking whether to use CACAO as VM" >&5
+echo $ECHO_N "checking whether to use CACAO as VM... $ECHO_C" >&6; }
+
+# Check whether --with-cacao was given.
+if test "${with_cacao+set}" = set; then
+ withval=$with_cacao;
+ case "${withval}" in
+ yes)
+ CACAO=/usr/local/cacao
+ ;;
+ no)
+ CACAO=no
+ ;;
+ *)
+ CACAO=${withval}
+ ;;
+ esac
+
+else
+
+ CACAO=no
+
+fi
+
+
+ { echo "$as_me:$LINENO: result: ${CACAO}" >&5
+echo "${ECHO_T}${CACAO}" >&6; }
+ if test x"${CACAO}" != "xno"; then
+ WITH_CACAO_TRUE=
+ WITH_CACAO_FALSE='#'
+else
+ WITH_CACAO_TRUE='#'
+ WITH_CACAO_FALSE=
+fi
+
+
+
+
# Check whether --enable-fast-build was given.
if test "${enable_fast_build+set}" = set; then
enableval=$enable_fast_build;
@@ -11571,6 +11613,13 @@ if test -z "${GNU_CLASSLIB_FOUND_TRUE}"
{ { echo "$as_me:$LINENO: error: conditional \"GNU_CLASSLIB_FOUND\"
was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"GNU_CLASSLIB_FOUND\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${WITH_CACAO_TRUE}" && test -z "${WITH_CACAO_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_CACAO\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_CACAO\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -12305,6 +12354,9 @@ OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_deli
OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_delim
GNU_CLASSLIB_FOUND_TRUE!$GNU_CLASSLIB_FOUND_TRUE$ac_delim
GNU_CLASSLIB_FOUND_FALSE!$GNU_CLASSLIB_FOUND_FALSE$ac_delim
+WITH_CACAO_TRUE!$WITH_CACAO_TRUE$ac_delim
+WITH_CACAO_FALSE!$WITH_CACAO_FALSE$ac_delim
+CACAO!$CACAO$ac_delim
FAST_BUILD_TRUE!$FAST_BUILD_TRUE$ac_delim
FAST_BUILD_FALSE!$FAST_BUILD_FALSE$ac_delim
ZERO_BUILD_TRUE!$ZERO_BUILD_TRUE$ac_delim
@@ -12352,7 +12404,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
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
@@ -12674,7 +12726,7 @@ echo "$as_me: executing $ac_file command
# 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\(//\)[^/]' \| \
diff -r d7f8439ac6db configure.ac
--- a/configure.ac Mon Mar 17 08:48:42 2008 -0400
+++ b/configure.ac Mon Mar 17 16:59:41 2008 +0100
@@ -176,6 +176,7 @@ fi
fi
WITH_OPENJDK_SRC_ZIP
WITH_OPENJDK_SRC_DIR
+AC_CHECK_WITH_CACAO
ENABLE_FAST_BUILD
ENABLE_ZERO_BUILD
ENABLE_NETX_PLUGIN
diff -r d7f8439ac6db patches/icedtea-cacao.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao.patch Mon Mar 17 16:59:41 2008 +0100
@@ -0,0 +1,12 @@
+--- ../icedtea6/openjdk/jdk/src/share/bin/java.c 2008-02-28
10:42:00.000000000 +0100
++++ openjdk/jdk/src/share/bin/java.c 2008-03-17 16:23:05.804846720
+0100
+@@ -367,7 +367,8 @@
+ args.classname = classname;
+ args.ifn = ifn;
+
+- return ContinueInNewThread(JavaMain, threadStackSize,
(void*)&args, ret);
++/* return ContinueInNewThread(JavaMain, threadStackSize,
(void*)&args, ret); */
++ return JavaMain((void*)&args);
+ }
+ }
+
More information about the distro-pkg-dev
mailing list