Add option --with-additional-vms, build once, get them all
Andrew John Hughes
gnu_andrew at member.fsf.org
Thu Apr 30 08:07:06 PDT 2009
2009/4/30 Matthias Klose <doko at ubuntu.com>:
> The attached patch adds a configure option --with-additional-vms, which allows
> passing of --with-additional-vms=cacao,shark to build two additional vm's on an
> architecture where hotspot is the default. Allowed values are cacao, shark and
> zero. Shark is not a separate build, but the zero build configured for shark.
>
> The VM's can then be used with `java -cacao', or `java -zero'.
>
> - cacao is just built in a separate build directory, without touching the
> main build.
>
> - zero/shark is built by calling the icedtea configure again, and then just
> building the hotspot configured for zero.
>
> The patch doesn't touch the regular build, so it should be safe to apply, but I
> would be happy if somebody could test it.
>
> Matthias
>
> PS: Requires cacao-0.99.4, will update this in a separate patch.
>
>
>
> * 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.
> * configure.ac: New option --with-additional-vms=.
>
> diff -r d65e58dcaed5 Makefile.am
> --- a/Makefile.am Thu Apr 30 14:37:12 2009 +0200
> +++ b/Makefile.am Thu Apr 30 15:27:47 2009 +0200
> @@ -428,6 +428,9 @@
> if WITH_CACAO
> rm -f $(CACAO_SRC_ZIP)
> endif
> +if ADD_CACAO_BUILD
> + rm -f $(CACAO_SRC_ZIP)
> +endif
> if WITH_VISUALVM
> rm -f $(VISUALVM_SRC_ZIP)
> rm -f $(NETBEANS_PROFILER_SRC_ZIP)
> @@ -633,9 +636,10 @@
> 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
> @@ -1259,11 +1263,15 @@
>
> 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
> # ===================
> @@ -1719,6 +1727,129 @@
>
> # 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
> +if ADD_CACAO_BUILD
> +if USE_ALT_CACAO_SRC_ZIP
> +else
> + if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \
> + | $(MD5SUM) --check ; \
> + then \
> + if [ $(CACAO_SRC_ZIP) ] ; \
> + then \
> + mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
> + fi ; \
> + $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
> + fi
> +endif
> + if ! test -d cacao ; \
> + then \
> + mkdir cacao ; \
> + $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
> + dir=$$(basename cacao/cacao-*) ; \
> + ln -s $$dir cacao/cacao ; \
> + fi
> +
> + cd cacao/cacao && \
> + $(ARCH_PREFIX) ./configure \
> + --host=$(host_alias) \
> + --build=$(build_alias) \
> + --target=$(target_alias) \
> + --prefix=$(abs_top_builddir)/cacao/install \
> + --with-java-runtime-library=openjdk \
> + --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); \
> + $(ARCH_PREFIX) $(MAKE) install
> +
> + 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/
> + grep -q -- '^-cacao KNOWN' $(BUILD_JRE_ARCH_DIR)/jvm.cfg \
> + || printf -- '-cacao KNOWN\n' >> $(BUILD_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/
> + grep -q -- '^-zero KNOWN' $(BUILD_JRE_ARCH_DIR)/jvm.cfg \
> + || printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
> +endif
> + touch $@
> +
> +stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp
> +
> +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/
> + grep -q -- '^-zero KNOWN' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg \
> + || printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
> +endif
> + touch $@
> +
> +# end additional VMs
> +
> # jtreg
>
> stamps/jtreg.stamp: stamps/icedtea.stamp
> diff -r d65e58dcaed5 configure.ac
> --- a/configure.ac Thu Apr 30 14:37:12 2009 +0200
> +++ b/configure.ac Thu Apr 30 15:27:47 2009 +0200
> @@ -499,7 +499,38 @@
> 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)
> +
> +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 +548,7 @@
> 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 +562,8 @@
> 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 d65e58dcaed5 patches/icedtea-cacao.patch
> --- a/patches/icedtea-cacao.patch Thu Apr 30 14:37:12 2009 +0200
> +++ b/patches/icedtea-cacao.patch Thu Apr 30 15:27:47 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);
> }
> }
>
>
>
Rather than adding yet more conflicting options, could we not just add
--enable/disable-hotspot, so which VMs are built is determined by the
state of --enable-zero/shark/cacao/hotspot?
--
Andrew :-)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list