changeset in /hg/icedtea6: 2008-03-26 Gary Benson <gbenson at red...
Lillian Angel
langel at redhat.com
Wed Mar 26 09:45:00 PDT 2008
Hi,
When I do a full-build, it fails. It is due to these changes.
ecj-poured IcedTea is served: openjdk-ecj/control/build/linux-i586
mkdir -p stamps
touch stamps/icedtea-ecj.stamp
mkdir -p stamps
touch stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
ln -s
/notnfs/langel/icedtea6/openjdk-ecj/control/build/linux-i586/j2sdk-image/
bootstrap/icedtea
if ! test -d bootstrap/icedtea/include; then \
ln -sf
/notnfs/langel/icedtea6/openjdk-ecj/control/build/linux-i586//include
bootstrap/icedtea/include; \
fi
mkdir -p stamps
touch stamps/bootstrap-directory.stamp
mkdir -p bootstrap
rm -f bootstrap/jdk1.6.0
ln -sf icedtea bootstrap/jdk1.6.0; \
if ! bootstrap/jdk1.6.0/bin/java -version ; \
then \
echo "bootstrap/jdk1.6.0/bin/java" \
"cannot be found or is corrupted." ; \
exit 1; \
fi
Error: no `core' JVM at
`/notnfs/langel/icedtea6/openjdk-ecj/control/build/linux-i586/j2sdk-image/jre/lib/i386/core/libjvm.so'.
bootstrap/jdk1.6.0/bin/java cannot be found or is corrupted.
make: *** [stamps/bootstrap-directory-symlink.stamp] Error 1
Gary Benson wrote:
> changeset 4749fccc0859 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4749fccc0859
> description:
> 2008-03-26 Gary Benson <gbenson at redhat.com>
>
> * patches/icedtea-zero-build.patch: Added zero-specific bits to
> class library makefiles.
> * patches/icedtea-cacao.patch: Moved platform-specific bits from
> icedtea-ports.patch.
> * patches/icedtea-ports.patch: Removed.
>
> * jvm.cfg.in: New file.
> * ergo.c.in: Likewise.
> * acinclude.m4
> (ENABLE_ZERO_BUILD): Added new generated files jvm.cfg and ergo.c.
> * Makefile.am
> (stamps/ports.stamp, stamps/ports-ecj.stamp): Use jvm.cfg and ergo.c.
> (ICEDTEA_PATCHES): Removed icedtea-ports.patch.
> * Makefile.in, aclocal.m4, configure: Regenerated.
> * .hgignore: Added jvm.cfg and ergo.c.
>
> * ports/jdk/src/solaris/bin/alpha/jvm.cfg: Removed.
> * ports/jdk/src/solaris/bin/arm/jvm.cfg: Likewise.
> * ports/jdk/src/solaris/bin/mips/jvm.cfg: Likewise.
> * ports/jdk/src/solaris/bin/ppc/jvm.cfg: Likewise.
> * ports/jdk/src/solaris/bin/ppc64/jvm.cfg: Likewise.
> * ports/jdk/src/solaris/bin/s390/jvm.cfg: Likewise.
> * ports/jdk/src/solaris/bin/s390x/jvm.cfg: Likewise.
> * ports/jdk/src/solaris/bin/ergo_alpha.c: Likewise.
> * ports/jdk/src/solaris/bin/ergo_arm.c: Likewise.
> * ports/jdk/src/solaris/bin/ergo_ia64.c: Likewise.
> * ports/jdk/src/solaris/bin/ergo_mips.c: Likewise.
> * ports/jdk/src/solaris/bin/ergo_ppc.c: Likewise.
> * ports/jdk/src/solaris/bin/ergo_s390.c: Likewise.
>
> diffstat:
>
> 25 files changed, 548 insertions(+), 973 deletions(-)
> .hgignore | 2
> ChangeLog | 32 ++++
> Makefile.am | 21 ++
> Makefile.in | 62 ++++---
> acinclude.m4 | 4
> aclocal.m4 | 48 ++----
> configure | 22 +-
> ergo.c.in | 58 +++++++
> jvm.cfg.in | 45 +++++
> patches/icedtea-cacao.patch | 155 +++++++++++++++++++
> patches/icedtea-ports.patch | 243 -------------------------------
> patches/icedtea-zero-build.patch | 166 +++++++++++++++++++++
> ports/jdk/src/solaris/bin/alpha/jvm.cfg | 45 -----
> ports/jdk/src/solaris/bin/arm/jvm.cfg | 45 -----
> ports/jdk/src/solaris/bin/ergo_alpha.c | 58 -------
> ports/jdk/src/solaris/bin/ergo_arm.c | 58 -------
> ports/jdk/src/solaris/bin/ergo_ia64.c | 58 -------
> ports/jdk/src/solaris/bin/ergo_mips.c | 58 -------
> ports/jdk/src/solaris/bin/ergo_ppc.c | 58 -------
> ports/jdk/src/solaris/bin/ergo_s390.c | 58 -------
> ports/jdk/src/solaris/bin/mips/jvm.cfg | 45 -----
> ports/jdk/src/solaris/bin/ppc/jvm.cfg | 45 -----
> ports/jdk/src/solaris/bin/ppc64/jvm.cfg | 45 -----
> ports/jdk/src/solaris/bin/s390/jvm.cfg | 45 -----
> ports/jdk/src/solaris/bin/s390x/jvm.cfg | 45 -----
>
> diffs (truncated from 1842 to 500 lines):
>
> diff -r 49178a613301 -r 4749fccc0859 .hgignore
> --- a/.hgignore Wed Mar 26 04:57:38 2008 -0400
> +++ b/.hgignore Wed Mar 26 06:44:13 2008 -0400
> @@ -20,6 +20,8 @@ hotspot-tools-source-files.txt
> hotspot-tools-source-files.txt
> tools-source-files.txt
> platform_zero
> +jvm.cfg
> +ergo.c
> rt/com/sun/jdi/AbsentInformationException.java
> rt/com/sun/jdi/Accessible.java
> rt/com/sun/jdi/ArrayReference.java
> diff -r 49178a613301 -r 4749fccc0859 ChangeLog
> --- a/ChangeLog Wed Mar 26 04:57:38 2008 -0400
> +++ b/ChangeLog Wed Mar 26 06:44:13 2008 -0400
> @@ -1,3 +1,35 @@ 2008-03-26 Gary Benson <gbenson at redhat
> +2008-03-26 Gary Benson <gbenson at redhat.com>
> +
> + * patches/icedtea-zero-build.patch: Added zero-specific bits to
> + class library makefiles.
> + * patches/icedtea-cacao.patch: Moved platform-specific bits from
> + icedtea-ports.patch.
> + * patches/icedtea-ports.patch: Removed.
> +
> + * jvm.cfg.in: New file.
> + * ergo.c.in: Likewise.
> + * acinclude.m4
> + (ENABLE_ZERO_BUILD): Added new generated files jvm.cfg and ergo.c.
> + * Makefile.am
> + (stamps/ports.stamp, stamps/ports-ecj.stamp): Use jvm.cfg and ergo.c.
> + (ICEDTEA_PATCHES): Removed icedtea-ports.patch.
> + * Makefile.in, aclocal.m4, configure: Regenerated.
> + * .hgignore: Added jvm.cfg and ergo.c.
> +
> + * ports/jdk/src/solaris/bin/alpha/jvm.cfg: Removed.
> + * ports/jdk/src/solaris/bin/arm/jvm.cfg: Likewise.
> + * ports/jdk/src/solaris/bin/mips/jvm.cfg: Likewise.
> + * ports/jdk/src/solaris/bin/ppc/jvm.cfg: Likewise.
> + * ports/jdk/src/solaris/bin/ppc64/jvm.cfg: Likewise.
> + * ports/jdk/src/solaris/bin/s390/jvm.cfg: Likewise.
> + * ports/jdk/src/solaris/bin/s390x/jvm.cfg: Likewise.
> + * ports/jdk/src/solaris/bin/ergo_alpha.c: Likewise.
> + * ports/jdk/src/solaris/bin/ergo_arm.c: Likewise.
> + * ports/jdk/src/solaris/bin/ergo_ia64.c: Likewise.
> + * ports/jdk/src/solaris/bin/ergo_mips.c: Likewise.
> + * ports/jdk/src/solaris/bin/ergo_ppc.c: Likewise.
> + * ports/jdk/src/solaris/bin/ergo_s390.c: Likewise.
> +
> 2008-03-26 Gary Benson <gbenson at redhat.com>
>
> * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
> diff -r 49178a613301 -r 4749fccc0859 Makefile.am
> --- a/Makefile.am Wed Mar 26 04:57:38 2008 -0400
> +++ b/Makefile.am Wed Mar 26 06:44:13 2008 -0400
> @@ -194,12 +194,18 @@ clean-download:
> # Link ports sources into tree
> stamps/ports.stamp: stamps/extract.stamp
> for target in ports/hotspot/build/*/makefiles/* \
> - ports/hotspot/src/*/* \
> - ports/jdk/src/*/bin/*; do \
> + ports/hotspot/src/*/*; do \
> link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
> ln -sf $$PWD/$$target $$link; \
> done
> ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
> + if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
> + mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
> + ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
> + fi
> + if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
> + ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
> + fi
> mkdir -p stamps
> touch stamps/ports.stamp
>
> @@ -264,7 +270,6 @@ ICEDTEA_PATCHES = \
> patches/icedtea-corba.patch \
> patches/icedtea-core-build.patch \
> patches/icedtea-linker-options.patch \
> - patches/icedtea-ports.patch \
> patches/icedtea-static-libstdc++.patch \
> patches/icedtea-lcms-leak.patch \
> patches/icedtea-timerqueue.patch \
> @@ -353,12 +358,18 @@ clean-extract-ecj:
> # Link ports sources into tree
> stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
> for target in ports/hotspot/build/*/makefiles/* \
> - ports/hotspot/src/*/* \
> - ports/jdk/src/*/bin/*; do \
> + ports/hotspot/src/*/*; do \
> link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
> ln -sf $$PWD/$$target $$link; \
> done
> ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
> + if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
> + mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
> + ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
> + fi
> + if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
> + ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
> + fi
> mkdir -p stamps
> touch stamps/ports-ecj.stamp
>
> diff -r 49178a613301 -r 4749fccc0859 Makefile.in
> --- a/Makefile.in Wed Mar 26 04:57:38 2008 -0400
> +++ b/Makefile.in Wed Mar 26 06:44:13 2008 -0400
> @@ -1,8 +1,8 @@
> -# Makefile.in generated by automake 1.10.1 from Makefile.am.
> +# Makefile.in generated by automake 1.10 from Makefile.am.
> # @configure_input@
>
> # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
> -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> +# 2003, 2004, 2005, 2006 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.
> @@ -42,7 +42,8 @@ host_triplet = @host@
>
> subdir = .
> DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
> - $(srcdir)/Makefile.in $(srcdir)/javac.in $(srcdir)/javap.in \
> + $(srcdir)/Makefile.in $(srcdir)/ergo.c.in $(srcdir)/javac.in \
> + $(srcdir)/javap.in $(srcdir)/jvm.cfg.in \
> $(srcdir)/platform_zero.in $(top_srcdir)/configure AUTHORS \
> COPYING ChangeLog INSTALL NEWS config.guess config.sub \
> install-sh missing
> @@ -54,7 +55,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
> am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
> configure.lineno config.status.lineno
> mkinstalldirs = $(install_sh) -d
> -CONFIG_CLEAN_FILES = javac javap platform_zero
> +CONFIG_CLEAN_FILES = javac javap platform_zero jvm.cfg ergo.c
> SOURCES =
> DIST_SOURCES =
> DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> @@ -375,7 +376,6 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
> patches/icedtea-javafiles.patch patches/icedtea-corba.patch \
> patches/icedtea-core-build.patch \
> patches/icedtea-linker-options.patch \
> - patches/icedtea-ports.patch \
> patches/icedtea-static-libstdc++.patch \
> patches/icedtea-lcms-leak.patch \
> patches/icedtea-timerqueue.patch \
> @@ -474,6 +474,10 @@ javap: $(top_builddir)/config.status $(s
> javap: $(top_builddir)/config.status $(srcdir)/javap.in
> cd $(top_builddir) && $(SHELL) ./config.status $@
> platform_zero: $(top_builddir)/config.status $(srcdir)/platform_zero.in
> + cd $(top_builddir) && $(SHELL) ./config.status $@
> +jvm.cfg: $(top_builddir)/config.status $(srcdir)/jvm.cfg.in
> + cd $(top_builddir) && $(SHELL) ./config.status $@
> +ergo.c: $(top_builddir)/config.status $(srcdir)/ergo.c.in
> cd $(top_builddir) && $(SHELL) ./config.status $@
> tags: TAGS
> TAGS:
> @@ -523,10 +527,6 @@ 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)
> @@ -553,8 +553,6 @@ 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*) \
> @@ -698,17 +696,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-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
> + 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
>
>
> # Top-Level Targets
> @@ -773,12 +771,18 @@ clean-download:
> # Link ports sources into tree
> stamps/ports.stamp: stamps/extract.stamp
> for target in ports/hotspot/build/*/makefiles/* \
> - ports/hotspot/src/*/* \
> - ports/jdk/src/*/bin/*; do \
> + ports/hotspot/src/*/*; do \
> link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
> ln -sf $$PWD/$$target $$link; \
> done
> ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
> + if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
> + mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
> + ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
> + fi
> + if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
> + ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
> + fi
> mkdir -p stamps
> touch stamps/ports.stamp
>
> @@ -853,12 +857,18 @@ clean-extract-ecj:
> # Link ports sources into tree
> stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
> for target in ports/hotspot/build/*/makefiles/* \
> - ports/hotspot/src/*/* \
> - ports/jdk/src/*/bin/*; do \
> + ports/hotspot/src/*/*; do \
> link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
> ln -sf $$PWD/$$target $$link; \
> done
> ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
> + if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \
> + mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
> + ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
> + fi
> + if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
> + ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
> + fi
> mkdir -p stamps
> touch stamps/ports-ecj.stamp
>
> diff -r 49178a613301 -r 4749fccc0859 acinclude.m4
> --- a/acinclude.m4 Wed Mar 26 04:57:38 2008 -0400
> +++ b/acinclude.m4 Wed Mar 26 06:44:13 2008 -0400
> @@ -579,13 +579,15 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
> ZERO_ARCHFLAG="-m64"
> ;;
> esac
> - AC_CONFIG_FILES([platform_zero])
> fi
> AC_SUBST(ZERO_LIBARCH)
> AC_SUBST(ZERO_BITSPERWORD)
> AC_SUBST(ZERO_ENDIANNESS)
> AC_SUBST(ZERO_ARCHDEF)
> AC_SUBST(ZERO_ARCHFLAG)
> + AC_CONFIG_FILES([platform_zero])
> + AC_CONFIG_FILES([jvm.cfg])
> + AC_CONFIG_FILES([ergo.c])
> ])
>
> AC_DEFUN([SET_CORE_BUILD],
> diff -r 49178a613301 -r 4749fccc0859 aclocal.m4
> --- a/aclocal.m4 Wed Mar 26 04:57:38 2008 -0400
> +++ b/aclocal.m4 Wed Mar 26 06:44:13 2008 -0400
> @@ -1,7 +1,7 @@
> -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
> +# generated automatically by aclocal 1.10 -*- Autoconf -*-
>
> # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
> -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> +# 2005, 2006 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,13 +11,10 @@
> # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
> # PARTICULAR PURPOSE.
>
> -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'.])])
> +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])])
>
> # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
> #
> @@ -177,7 +174,7 @@ fi[]dnl
> fi[]dnl
> ])# PKG_CHECK_MODULES
>
> -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
> +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
> #
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> @@ -192,7 +189,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.1], [],
> +m4_if([$1], [1.10], [],
> [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
> ])
>
> @@ -208,10 +205,8 @@ 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.1])dnl
> -m4_ifndef([AC_AUTOCONF_VERSION],
> - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
> -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
> +[AM_AUTOMAKE_VERSION([1.10])dnl
> +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
>
> # AM_AUX_DIR_EXPAND -*- Autoconf -*-
>
> @@ -483,7 +478,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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
> + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
> dirpart=`AS_DIRNAME("$mf")`
> else
> continue
> @@ -531,13 +526,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, 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 13
> +# 2005, 2006 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
>
> # 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.
> @@ -642,17 +637,16 @@ 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
> - $_am_arg | $_am_arg:* )
> + $1 | $1:* )
> break ;;
> * )
> _am_stamp_count=`expr $_am_stamp_count + 1` ;;
> esac
> done
> -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
> +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
>
> # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
> #
> @@ -941,7 +935,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
>
> # _AM_SUBST_NOTMAKE(VARIABLE)
> # ---------------------------
> -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
> +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
> # This macro is traced by Automake.
> AC_DEFUN([_AM_SUBST_NOTMAKE])
>
> diff -r 49178a613301 -r 4749fccc0859 configure
> --- a/configure Wed Mar 26 04:57:38 2008 -0400
> +++ b/configure Wed Mar 26 06:44:13 2008 -0400
> @@ -8755,13 +8755,17 @@ esac
> ZERO_ARCHFLAG="-m64"
> ;;
> esac
> - ac_config_files="$ac_config_files platform_zero"
> -
> - fi
> -
> -
> -
> -
> + fi
> +
> +
> +
> +
> +
> + ac_config_files="$ac_config_files platform_zero"
> +
> + ac_config_files="$ac_config_files jvm.cfg"
> +
> + ac_config_files="$ac_config_files ergo.c"
>
>
>
> @@ -12122,6 +12126,8 @@ do
> "javac") CONFIG_FILES="$CONFIG_FILES javac" ;;
> "javap") CONFIG_FILES="$CONFIG_FILES javap" ;;
> "platform_zero") CONFIG_FILES="$CONFIG_FILES platform_zero" ;;
> + "jvm.cfg") CONFIG_FILES="$CONFIG_FILES jvm.cfg" ;;
> + "ergo.c") CONFIG_FILES="$CONFIG_FILES ergo.c" ;;
>
> *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
> echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
> @@ -12726,7 +12732,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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
> + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
> dirpart=`$as_dirname -- "$mf" ||
> $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
> X"$mf" : 'X\(//\)[^/]' \| \
> diff -r 49178a613301 -r 4749fccc0859 ergo.c.in
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/ergo.c.in Wed Mar 26 06:44:13 2008 -0400
> @@ -0,0 +1,58 @@
> +/*
> + * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> + *
> + * This code is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License version 2 only, as
> + * published by the Free Software Foundation. Sun designates this
> + * particular file as subject to the "Classpath" exception as provided
> + * by Sun in the LICENSE file that accompanied this code.
> + *
> + * This code is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + * version 2 for more details (a copy is included in the LICENSE file that
> + * accompanied this code).
> + *
> + * You should have received a copy of the GNU General Public License version
> + * 2 along with this work; if not, write to the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
> + *
> + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
> + * CA 95054 USA or visit www.sun.com if you need additional information or
> + * have any questions.
> + */
> +#include "ergo.h"
> +
> +
> +/* Methods for solaris-sparc and linux-sparc: these are easy. */
> +
> +/* Ask the OS how many processors there are. */
> +static unsigned long
> +physical_processors(void) {
> + const unsigned long sys_processors = sysconf(_SC_NPROCESSORS_CONF);
> +
> + JLI_TraceLauncher("sysconf(_SC_NPROCESSORS_CONF): %lu\n", sys_processors);
> + return sys_processors;
> +}
> +
> +/* The sparc version of the "server-class" predicate. */
> +jboolean
> +ServerClassMachineImpl(void) {
> + jboolean result = JNI_FALSE;
> + /* How big is a server class machine? */
> + const unsigned long server_processors = 2UL;
> + const uint64_t server_memory = 2UL * GB;
> + const uint64_t actual_memory = physical_memory();
> +
> + /* Is this a server class machine? */
> + if (actual_memory >= server_memory) {
> + const unsigned long actual_processors = physical_processors();
> + if (actual_processors >= server_processors) {
> + result = JNI_TRUE;
> + }
> + }
> + JLI_TraceLauncher("unix_" LIBARCHNAME "_ServerClassMachine: %s\n",
> + (result == JNI_TRUE ? "JNI_TRUE" : "JNI_FALSE"));
> + return result;
> +}
> diff -r 49178a613301 -r 4749fccc0859 jvm.cfg.in
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/jvm.cfg.in Wed Mar 26 06:44:13 2008 -0400
> @@ -0,0 +1,45 @@
More information about the distro-pkg-dev
mailing list