changeset in /hg/icedtea6: 2009-05-01 Matthias Klose <doko at ubu...
doko at ubuntu.com
doko at ubuntu.com
Fri May 1 10:51:37 PDT 2009
changeset d0f6e94ed76d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d0f6e94ed76d
description:
2009-05-01 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-cacao.patch: Create new thread depending on the
current VM.
* Makefile.am (ICEDTEA_PATCHES): Apply unconditionally.
(icedtea-against-icedtea): Add dependencies on stamps/add-cacao.stamp,
stamps/add-zero.stamp.
(icedtea-debug-against-icedtea): Add dependencies on
stamps/add-cacao-debug.stamp, stamps/add-zero-debug.stamp.
(stamps/add-{cacao,zero}{,-debug}.stamp: New.
(clean, stamps/download.stamp, clean-download, stamps/extract.stamp
stamps/cacao.stamp): Use BUILD_CACAO instead of WITH_CACAO.
(stamps/icedtea.stamp, stamps/icedtea-debug.stamp): Add VM aliases
for cacao and zero when configured as ZERO_BUILD or WITH_CACAO.
* configure.ac: New option --with-additional-vms=, new conditionals
ADD_CACAO_BUILD, ADD_ZERO_BUILD, ADD_SHARK_BUILD, BUILD_CACAO.
diffstat:
8 files changed, 266 insertions(+), 18 deletions(-)
ChangeLog | 17 ++++
HACKING | 3
INSTALL | 17 ++++
Makefile.am | 148 ++++++++++++++++++++++++++++++++++++++++---
NEWS | 4 +
README | 18 +++++
configure.ac | 40 +++++++++++
patches/icedtea-cacao.patch | 37 +++++++++-
diffs (454 lines):
diff -r 868030b86280 -r d0f6e94ed76d ChangeLog
--- a/ChangeLog Fri May 01 12:26:02 2009 -0400
+++ b/ChangeLog Fri May 01 19:47:19 2009 +0200
@@ -1,3 +1,20 @@ 2009-05-01 Lillian Angel <langel at redha
+2009-05-01 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-cacao.patch: Create new thread depending on the
+ current VM.
+ * Makefile.am (ICEDTEA_PATCHES): Apply unconditionally.
+ (icedtea-against-icedtea): Add dependencies on stamps/add-cacao.stamp,
+ stamps/add-zero.stamp.
+ (icedtea-debug-against-icedtea): Add dependencies on
+ stamps/add-cacao-debug.stamp, stamps/add-zero-debug.stamp.
+ (stamps/add-{cacao,zero}{,-debug}.stamp: New.
+ (clean, stamps/download.stamp, clean-download, stamps/extract.stamp
+ stamps/cacao.stamp): Use BUILD_CACAO instead of WITH_CACAO.
+ (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): Add VM aliases
+ for cacao and zero when configured as ZERO_BUILD or WITH_CACAO.
+ * configure.ac: New option --with-additional-vms=, new conditionals
+ ADD_CACAO_BUILD, ADD_ZERO_BUILD, ADD_SHARK_BUILD, BUILD_CACAO.
+
2009-05-01 Lillian Angel <langel at redhat.com>
* HACKING: Updated.
diff -r 868030b86280 -r d0f6e94ed76d HACKING
--- a/HACKING Fri May 01 12:26:02 2009 -0400
+++ b/HACKING Fri May 01 19:47:19 2009 +0200
@@ -94,6 +94,7 @@ The following patches are currently appl
* 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.
The following patches are only applied to OpenJDK6 in IcedTea6:
@@ -152,8 +153,6 @@ The following patches are only applied w
The following patches are only applied when building with the CACAO virtual machine:
-* icedtea-cacao.patch: Don't run 'java' in a new thread.
-
The following patches are to support Xrender pipeline (-Dsun.java2d.xrender):
* icedtea-xrender-xxx.patch: Numbered patches from xrender branch
diff -r 868030b86280 -r d0f6e94ed76d INSTALL
--- a/INSTALL Fri May 01 12:26:02 2009 -0400
+++ b/INSTALL Fri May 01 19:47:19 2009 +0200
@@ -111,3 +111,20 @@ 0.99.3 during the build. To use a diffe
--with-cacao-home=<dir> to point to an existing installation which use
the Sun VM interface.
+Building additional virtual machines
+------------------------------------
+
+Although IcedTea can be built multiple times to use a different virtual
+machine, addtional VM's can be built without building the other components
+multiple times.
+
+On architectures where hotspot is available, use
+ --with-additional-vms=cacao,zero (or shark instead of zero)
+on architectures where only zero (or shark) is available, use
+ --with-additional-vms=cacao
+to build the additional VM's. It's not possible to build cacao as the
+default VM, and zero as additional VM.
+
+The additional VM's are available by calling the java with the option
+`-cacao' or `-zero' (for shark as well), or by calling the java tools with
+`-J-<vm name>'.
diff -r 868030b86280 -r d0f6e94ed76d Makefile.am
--- a/Makefile.am Fri May 01 12:26:02 2009 -0400
+++ b/Makefile.am Fri May 01 19:47:19 2009 +0200
@@ -72,8 +72,13 @@ if ENABLE_GCJWEBPLUGIN
rm -f gcjwebplugin.so
endif
endif
+if BUILD_CACAO
rm -rf cacao
+endif
rm -f jni-common.o
+if ADD_ZERO_BUILD
+ rm -rf zerovm
+endif
install:
@@ -377,7 +382,7 @@ endif
endif
endif
endif
-if WITH_CACAO
+if BUILD_CACAO
if !USE_SYSTEM_CACAO
if USE_ALT_CACAO_SRC_ZIP
else
@@ -425,7 +430,7 @@ clean-download:
clean-download:
rm -f stamps/download.stamp
rm -f $(OPENJDK_SRC_ZIP)
-if WITH_CACAO
+if BUILD_CACAO
rm -f $(CACAO_SRC_ZIP)
endif
if WITH_VISUALVM
@@ -632,9 +637,10 @@ ICEDTEA_PATCHES += \
patches/icedtea-rhino.patch
endif
+ICEDTEA_PATCHES += \
+ patches/icedtea-cacao.patch
if WITH_CACAO
ICEDTEA_PATCHES += \
- patches/icedtea-cacao.patch \
patches/icedtea-cacao-ignore-jdi-tests.patch \
patches/icedtea-cacao-ignore-tests.patch
endif
@@ -707,7 +713,7 @@ if WITH_ALT_HSBUILD
fi
endif
endif
-if WITH_CACAO
+if BUILD_CACAO
if !USE_SYSTEM_CACAO
if ! test -d cacao ; \
then \
@@ -1173,6 +1179,12 @@ endif
cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+if ZERO_BUILD
+ printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
+if WITH_CACAO
+ printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
mkdir -p stamps
touch stamps/icedtea.stamp
@@ -1245,6 +1257,12 @@ endif
cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
+if ZERO_BUILD
+ printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
+if WITH_CACAO
+ printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
mkdir -p stamps
@@ -1258,11 +1276,15 @@ clean-icedtea: stamps/extract.stamp
icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea.stamp
+ stamps/icedtea.stamp \
+ stamps/add-cacao.stamp \
+ stamps/add-zero.stamp
icedtea-debug-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea-debug.stamp
+ stamps/icedtea-debug.stamp \
+ stamps/add-cacao-debug.stamp \
+ stamps/add-zero-debug.stamp
# OpenJDK ecj Targets
# ===================
@@ -1559,10 +1581,10 @@ extra-lib/about.jar: stamps/extra-class-
fi
stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
-if WITH_CACAO
+if BUILD_CACAO
if !USE_SYSTEM_CACAO
cd cacao/cacao && \
- ./configure \
+ $(ARCH_PREFIX) ./configure \
--host=$(host_alias) \
--build=$(build_alias) \
--target=$(target_alias) \
@@ -1571,7 +1593,7 @@ if !USE_SYSTEM_CACAO
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
--with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \
--enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
- make install
+ $(ARCH_PREFIX) $(MAKE) install
endif
endif
mkdir -p stamps
@@ -1717,6 +1739,114 @@ endif
endif
# end of pulse-java
+
+# targets for additional VMs
+
+BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+
+stamps/add-cacao.stamp: stamps/icedtea.stamp stamps/cacao.stamp
+if ADD_CACAO_BUILD
+ mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao
+ install -m 644 cacao/install/lib/libjvm.so \
+ $(BUILD_JRE_ARCH_DIR)/cacao/
+ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \
+ $(BUILD_JRE_ARCH_DIR)/cacao/
+ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \
+ $(BUILD_JRE_ARCH_DIR)/cacao/
+ printf -- '-cacao KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+else
+ printf -- '-cacao ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
+ touch $@
+
+stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp
+if ADD_CACAO_BUILD
+ mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
+ install -m 644 cacao/install/lib/libjvm.so \
+ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
+ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \
+ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
+ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \
+ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
+ printf -- '-cacao KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+else
+ printf -- '-cacao ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
+ touch $@
+
+
+# configure script arguments, quoted in single quotes
+CONFIGURE_ARGS = @CONFIGURE_ARGS@
+ADD_ZERO_CONFIGURE_ARGS = \
+ --with-openjdk \
+ --with-openjdk-home=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+ --enable-zero
+if ADD_SHARK_BUILD
+ADD_ZERO_CONFIGURE_ARGS += \
+ --enable-shark
+endif
+ADD_ZERO_CONFIGURE_ARGS += \
+ --disable-docs \
+ $(filter-out '--with-gcj-home=% '--with-ecj=% \
+ '--with-java=% '--with-javah=% \
+ '--with-rmic=% '--with-additional-vms=% \
+ '--with-icedtea '--with-icedtea-home=% \
+ '--with-openjdk '--with-openjdk-home=% , \
+ $(CONFIGURE_ARGS))
+
+ADD_ZERO_EXTRA_BUILD_ENV = \
+ BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \
+ BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \
+ BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \
+ BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \
+ BUILD_JDK=false
+
+stamps/add-zero.stamp: stamps/icedtea.stamp
+if ADD_ZERO_BUILD
+ mkdir -p zerovm
+
+ for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
+ cd zerovm && \
+ $(ADD_ZERO_EXTRA_BUILD_ENV) \
+ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
+
+ for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
+ $(ADD_ZERO_EXTRA_BUILD_ENV) \
+ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET)
+
+ mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
+ cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ $(BUILD_JRE_ARCH_DIR)/zero/
+ printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+else
+ printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
+ touch $@
+
+stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp
+if ADD_ZERO_BUILD
+ mkdir -p zerovm
+
+ for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
+ cd zerovm && \
+ $(ADD_ZERO_EXTRA_BUILD_ENV) \
+ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
+
+ for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
+ $(ADD_ZERO_EXTRA_BUILD_ENV) \
+ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET)
+
+ mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
+ cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ $(BUILD_DEBUG_JRE_ARCH_DIR)/zero/
+ printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+else
+ printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
+ touch $@
+
+# end additional VMs
# jtreg
diff -r 868030b86280 -r d0f6e94ed76d NEWS
--- a/NEWS Fri May 01 12:26:02 2009 -0400
+++ b/NEWS Fri May 01 19:47:19 2009 +0200
@@ -6,6 +6,10 @@ New in release 1.X (UNRELEASED)
tapset that can be used to dynamically trace execution of java
applications at runtime. See the tapset/hotspot.stp file for
documentation of the various trace points and arguments available.
+- Allow building of other virtual machines besides the default VM. Additional
+ virtual machines on architectures where hotspot is available are cacao
+ and zero (or shark), and cacao, where zero (or shark) is available. It's
+ not possible to build cacao as the default VM, and zero as additional VM.
New in release 1.4 (2009-01-29)
diff -r 868030b86280 -r d0f6e94ed76d README
--- a/README Fri May 01 12:26:02 2009 -0400
+++ b/README Fri May 01 19:47:19 2009 +0200
@@ -167,3 +167,21 @@ optionally the systemtap package at run
optionally the systemtap package at run time when the user want to use
the tapset to trace java programs. The probes have zero overhead when
not used and can safely be compiled in even when not used at runtime.
+
+Support for additional VMs
+==========================
+
+Although IcedTea can be built multiple times to use a different virtual
+machine, addtional VM's can be built without building the other components
+multiple times.
+
+On architectures where hotspot is available, use
+ --with-additional-vms=cacao,zero (or shark instead of zero)
+on architectures where only zero (or shark) is available, use
+ --with-additional-vms=cacao
+to build the additional VM's. It's not possible to build cacao as the
+default VM, and zero as additional VM.
+
+If the build was configured with --with-additional-vms, the additional VM's
+are available by calling the java with the option `-cacao' or `-zero' (for
+shark as well), or by calling the java tools with `-J-<vm name>'.
diff -r 868030b86280 -r d0f6e94ed76d configure.ac
--- a/configure.ac Fri May 01 12:26:02 2009 -0400
+++ b/configure.ac Fri May 01 19:47:19 2009 +0200
@@ -499,7 +499,39 @@ else
fi
fi
-if test "x${ZERO_BUILD_TRUE}" = x; then
+AC_MSG_CHECKING(for --with-additional-vms)
+AC_ARG_WITH(additional-vms,
+ AC_HELP_STRING([--with-additional-vms=vm1,vm2,...], [build additional virtual machines. Valid value is a colon separated string with the backend names `cacao', `zero' and `shark'.]),
+[
+if test x$with_additional_vms != x
+then
+ for vm in `echo $with_additional_vms | sed 's/,/ /g'`; do
+ case "x$vm" in
+ xcacao) add_vm_cacao=yes;;
+ xzero) add_vm_zero=yes;;
+ xshark) add_vm_shark=yes;;
+ *) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...])
+ esac
+ done
+fi])
+AC_MSG_RESULT($with_additional_vms)
+
+AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x)
+AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x)
+AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x)
+AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes)
+
+if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then
+ AC_MSG_ERROR([additional vm is the default vm])
+fi
+if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x; then
+ AC_MSG_ERROR([additional vm is the default vm])
+fi
+if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then
+ AC_MSG_ERROR([cannot build with system cacao as additional vm])
+fi
+
+if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then
dnl Check for libffi headers and libraries.
PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no])
if test "x${LIBFFI_FOUND}" = xno
@@ -517,7 +549,7 @@ AC_SUBST(LIBFFI_CFLAGS)
AC_SUBST(LIBFFI_CFLAGS)
AC_SUBST(LIBFFI_LIBS)
-if test "x${SHARK_BUILD_TRUE}" = x; then
+if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
FIND_TOOL([LLVM_CONFIG], [llvm-config])
llvm_components="engine nativecodegen"
LLVM_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \
@@ -531,4 +563,8 @@ AC_SUBST(LLVM_LDFLAGS)
AC_SUBST(LLVM_LDFLAGS)
AC_SUBST(LLVM_LIBS)
+# Arguments passed to configure.
+AC_SUBST(CONFIGURE_ARGS)
+CONFIGURE_ARGS="$ac_configure_args"
+
AC_OUTPUT
diff -r 868030b86280 -r d0f6e94ed76d patches/icedtea-cacao.patch
--- a/patches/icedtea-cacao.patch Fri May 01 12:26:02 2009 -0400
+++ b/patches/icedtea-cacao.patch Fri May 01 19:47:19 2009 +0200
@@ -1,12 +1,39 @@
---- ../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 @@
+--- openjdk/jdk/src/share/bin/java.c.orig 2009-03-02 23:21:31.000000000 +0000
++++ openjdk/jdk/src/share/bin/java.c 2009-03-02 23:23:53.000000000 +0000
+@@ -199,6 +199,8 @@
+ InvocationFunctions ifn;
+ };
+
++#define JNI_VERSION_CACAO 0xcaca0000
++
+ /*
+ * Entry point.
+ */
+@@ -360,6 +389,8 @@
+
+ { /* Create a new thread to create JVM and invoke main method */
+ struct JavaMainArgs args;
++ struct JDK1_1InitArgs cacao_args;
++ int jvm_init_rv;
+
+ args.argc = argc;
+ args.argv = argv;
+@@ -367,7 +398,17 @@
args.classname = classname;
args.ifn = ifn;
- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
-+/* return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); */
-+ return JavaMain((void*)&args);
++ memset((void*)&cacao_args, 0, sizeof(cacao_args));
++ cacao_args.version = JNI_VERSION_CACAO;
++
++ jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args);
++ if (_launcher_debug)
++ printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no");
++
++ if (jvm_init_rv == 0)
++ return JavaMain((void*)&args);
++ else
++ return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
}
}
More information about the distro-pkg-dev
mailing list