Final zero patch (twisti please test)
Gary Benson
gbenson at redhat.com
Wed Mar 26 02:09:10 PDT 2008
Hi all,
This is mostly for twisti. I'm about to commit this patch to
icedtea6. It removes all the identical jvm.cfg and ergo_$arch.c
files, generating them at configure time, and removes the last
arch-specific bits from icedtea-ports.patch. Since cacao needs
these, I put them in icedtea-cacao.patch instead.
Twisti, is this ok?
Cheers,
Gary
--
http://gbenson.net/
-------------- next part --------------
diff -r 49178a613301 .hgignore
--- a/.hgignore Wed Mar 26 04:57:38 2008 -0400
+++ b/.hgignore Wed Mar 26 04:58:27 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 Makefile.am
--- a/Makefile.am Wed Mar 26 04:57:38 2008 -0400
+++ b/Makefile.am Wed Mar 26 04:58:27 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 Makefile.in
--- a/Makefile.in Wed Mar 26 04:57:38 2008 -0400
+++ b/Makefile.in Wed Mar 26 04:58:27 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 acinclude.m4
--- a/acinclude.m4 Wed Mar 26 04:57:38 2008 -0400
+++ b/acinclude.m4 Wed Mar 26 04:58:27 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 aclocal.m4
--- a/aclocal.m4 Wed Mar 26 04:57:38 2008 -0400
+++ b/aclocal.m4 Wed Mar 26 04:58:27 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 configure
--- a/configure Wed Mar 26 04:57:38 2008 -0400
+++ b/configure Wed Mar 26 04:58:27 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 ergo.c.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ergo.c.in Wed Mar 26 04:58:27 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 jvm.cfg.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jvm.cfg.in Wed Mar 26 04:58:27 2008 -0400
@@ -0,0 +1,45 @@
+#
+# @(#)jvm.cfg 1.7 07/05/05
+#
+#
+# Copyright 2002-2003 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.
+#
+#
+#
+# List of JVMs that can be used as an option to java, javac, etc.
+# Order is important -- first in this list is the default JVM.
+# NOTE that this both this file and its format are UNSUPPORTED and
+# WILL GO AWAY in a future release.
+#
+# You may also select a JVM in an arbitrary location with the
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+# and may not be available in a future release.
+#
+-core KNOWN
+-client IGNORE
+-server IGNORE
+-hotspot ERROR
+-classic WARN
+-native ERROR
+-green ERROR
diff -r 49178a613301 patches/icedtea-cacao.patch
--- a/patches/icedtea-cacao.patch Wed Mar 26 04:57:38 2008 -0400
+++ b/patches/icedtea-cacao.patch Wed Mar 26 04:58:27 2008 -0400
@@ -10,3 +10,158 @@
}
}
+diff -r 63b67d07d5e9 openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- a/openjdk/jdk/make/common/shared/Compiler-gcc.gmk Tue Mar 25 16:27:33 2008 +0000
++++ b/openjdk/jdk/make/common/shared/Compiler-gcc.gmk Wed Mar 26 08:24:35 2008 +0000
+@@ -75,28 +75,51 @@ ifeq ($(PLATFORM), linux)
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 3.2.*
+ else
+- ifneq ("$(findstring sparc,$(ARCH))", "")
+- # sparc or sparcv9
+- REQUIRED_CC_VER = 4.0
+- REQUIRED_GCC_VER = 4.0.*
+- else
+- ifeq ($(ARCH_DATA_MODEL), 32)
++ ifeq ($(ARCH), alpha)
++ # alpha
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), amd64)
++ # amd64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), arm)
++ # arm
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), i586)
+ # i586
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 3.2.1*
+ REQUIRED_GCC_VER_INT = 3.2.1-7a
+- else
+- ifeq ($(ARCH), amd64)
+- # amd64
+- REQUIRED_CC_VER = 3.2
+- REQUIRED_GCC_VER = 3.2.*
+ endif
+ ifeq ($(ARCH), ia64)
+ # ia64
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 2.9[56789].*
+ endif
++ ifeq ($(ARCH), mips)
++ # mips
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
+ endif
++ ifneq ("$(findstring ppc,$(ARCH))", "")
++ # ppc or ppc64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring s390,$(ARCH))", "")
++ # s390 or s390x
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring sparc,$(ARCH))", "")
++ # sparc or sparcv9
++ REQUIRED_CC_VER = 4.0
++ REQUIRED_GCC_VER = 4.0.*
+ endif
+ endif
+ # Option used to create a shared library
+diff -r 63b67d07d5e9 openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- a/openjdk/jdk/make/javax/sound/SoundDefs.gmk Tue Mar 25 16:27:33 2008 +0000
++++ b/openjdk/jdk/make/javax/sound/SoundDefs.gmk Wed Mar 26 08:29:28 2008 +0000
+@@ -58,9 +58,45 @@ ifdef ICEDTEA_ZERO_BUILD
+ ifdef ICEDTEA_ZERO_BUILD
+ CPPFLAGS += -DX_ARCH=X_ZERO
+ else
++ ifeq ($(ARCH), alpha)
++ CPPFLAGS += -DX_ARCH=X_ALPHA
++ endif # ARCH alpha
++
++ ifeq ($(ARCH), amd64)
++ CPPFLAGS += -DX_ARCH=X_AMD64
++ endif # ARCH amd64
++
++ ifeq ($(ARCH), arm)
++ CPPFLAGS += -DX_ARCH=X_ARM
++ endif # ARCH arm
++
+ ifeq ($(ARCH), i586)
+ CPPFLAGS += -DX_ARCH=X_I586
+ endif # ARCH i586
++
++ ifeq ($(ARCH), ia64)
++ CPPFLAGS += -DX_ARCH=X_IA64
++ endif # ARCH ia64
++
++ ifeq ($(ARCH), mips)
++ CPPFLAGS += -DX_ARCH=X_MIPS
++ endif # ARCH mips
++
++ ifeq ($(ARCH), ppc)
++ CPPFLAGS += -DX_ARCH=X_PPC
++ endif # ARCH ppc
++
++ ifeq ($(ARCH), ppc64)
++ CPPFLAGS += -DX_ARCH=X_PPC64
++ endif # ARCH ppc64
++
++ ifeq ($(ARCH), s390)
++ CPPFLAGS += -DX_ARCH=X_S390
++ endif # ARCH s390
++
++ ifeq ($(ARCH), s390x)
++ CPPFLAGS += -DX_ARCH=X_S390X
++ endif # ARCH s390x
+
+ ifeq ($(ARCH), sparc)
+ CPPFLAGS += -DX_ARCH=X_SPARC
+@@ -69,10 +105,6 @@ else
+ ifeq ($(ARCH), sparcv9)
+ CPPFLAGS += -DX_ARCH=X_SPARCV9
+ endif # ARCH sparcv9
+-
+- ifeq ($(ARCH), amd64)
+- CPPFLAGS += -DX_ARCH=X_AMD64
+- endif # ARCH amd64
+ endif
+
+
+diff -r 63b67d07d5e9 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- a/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Mar 25 16:27:33 2008 +0000
++++ b/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Mar 26 08:38:14 2008 +0000
+@@ -33,12 +33,19 @@
+ #define X_LINUX 3
+
+ // types for X_ARCH
+-#define X_I586 1
+-#define X_SPARC 2
+-#define X_SPARCV9 3
+-#define X_IA64 4
+-#define X_AMD64 5
+-#define X_ZERO 6
++#define X_ALPHA 1
++#define X_AMD64 2
++#define X_ARM 3
++#define X_I586 4
++#define X_IA64 5
++#define X_MIPS 6
++#define X_PPC 7
++#define X_PPC64 8
++#define X_S390 9
++#define X_S390X 10
++#define X_SPARC 11
++#define X_SPARCV9 12
++#define X_ZERO 13
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
diff -r 49178a613301 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2007-11-08 11:35:35.000000000 +0000
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2007-11-08 11:36:15.000000000 +0000
-@@ -109,6 +109,10 @@
- LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
- CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
- LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
-+CFLAGS_REQUIRED_ppc += -m32
-+LDFLAGS_COMMON_ppc += -m32
-+CFLAGS_REQUIRED_ppc64 += -m64
-+LDFLAGS_COMMON_ppc64 += -m64
- CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
- LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
-
-diff -r 37a05a11f281 make/common/shared/Compiler-gcc.gmk
---- a/jdk/make/common/shared/Compiler-gcc.gmk Sat Dec 01 00:00:00 2007 +0000
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk Wed Jan 23 14:02:23 2008 +0100
-@@ -70,28 +70,51 @@ ifeq ($(PLATFORM), linux)
- else
- CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
- endif
-- ifneq ("$(findstring sparc,$(ARCH))", "")
-- # sparc or sparcv9
-- REQUIRED_CC_VER = 4.0
-- REQUIRED_GCC_VER = 4.0.*
-- else
-- ifeq ($(ARCH_DATA_MODEL), 32)
-+ ifeq ($(ARCH), alpha)
-+ # alpha
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifeq ($(ARCH), amd64)
-+ # amd64
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifeq ($(ARCH), arm)
-+ # arm
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifeq ($(ARCH), i586)
- # i586
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 3.2.1*
- REQUIRED_GCC_VER_INT = 3.2.1-7a
-- else
-- ifeq ($(ARCH), amd64)
-- # amd64
-- REQUIRED_CC_VER = 3.2
-- REQUIRED_GCC_VER = 3.2.*
- endif
- ifeq ($(ARCH), ia64)
- # ia64
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 2.9[56789].*
- endif
-+ ifeq ($(ARCH), mips)
-+ # mips
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
- endif
-+ ifneq ("$(findstring ppc,$(ARCH))", "")
-+ # ppc or ppc64
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifneq ("$(findstring s390,$(ARCH))", "")
-+ # s390 or s390x
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifneq ("$(findstring sparc,$(ARCH))", "")
-+ # sparc or sparcv9
-+ REQUIRED_CC_VER = 4.0
-+ REQUIRED_GCC_VER = 4.0.*
- endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
-diff -ru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2007-11-08 11:34:54.000000000 +0000
-+++ openjdk/jdk/make/common/shared/Platform.gmk 2007-11-08 11:36:15.000000000 +0000
-@@ -225,9 +225,9 @@
- ARCH=sparcv9
- endif
- else
-- # i586 is 32-bit, amd64 is 64-bit
-+ # i586 and ppc are 32-bit, amd64 and ppc64 are 64-bit
- ifndef ARCH_DATA_MODEL
-- ifeq ($(ARCH), i586)
-+ ifneq ($(filter i586 ppc,$(ARCH)),)
- ARCH_DATA_MODEL=32
- else
- ARCH_DATA_MODEL=64
-diff -r 37a05a11f281 make/javax/sound/SoundDefs.gmk
---- a/jdk/make/javax/sound/SoundDefs.gmk Sat Dec 01 00:00:00 2007 +0000
-+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk Wed Jan 23 14:39:17 2008 +0100
-@@ -55,9 +55,45 @@ ifeq ($(PLATFORM), solaris)
-
- endif # PLATFORM solaris
-
-+ifeq ($(ARCH), alpha)
-+ CPPFLAGS += -DX_ARCH=X_ALPHA
-+endif # ARCH alpha
-+
-+ifeq ($(ARCH), amd64)
-+ CPPFLAGS += -DX_ARCH=X_AMD64
-+endif # ARCH amd64
-+
-+ifeq ($(ARCH), arm)
-+ CPPFLAGS += -DX_ARCH=X_ARM
-+endif # ARCH arm
-+
- ifeq ($(ARCH), i586)
- CPPFLAGS += -DX_ARCH=X_I586
- endif # ARCH i586
-+
-+ifeq ($(ARCH), ia64)
-+ CPPFLAGS += -DX_ARCH=X_IA64
-+endif # ARCH ia64
-+
-+ifeq ($(ARCH), mips)
-+ CPPFLAGS += -DX_ARCH=X_MIPS
-+endif # ARCH mips
-+
-+ifeq ($(ARCH), ppc)
-+ CPPFLAGS += -DX_ARCH=X_PPC
-+endif # ARCH ppc
-+
-+ifeq ($(ARCH), ppc64)
-+ CPPFLAGS += -DX_ARCH=X_PPC64
-+endif # ARCH ppc64
-+
-+ifeq ($(ARCH), s390)
-+ CPPFLAGS += -DX_ARCH=X_S390
-+endif # ARCH s390
-+
-+ifeq ($(ARCH), s390x)
-+ CPPFLAGS += -DX_ARCH=X_S390X
-+endif # ARCH s390x
-
- ifeq ($(ARCH), sparc)
- CPPFLAGS += -DX_ARCH=X_SPARC
-@@ -66,10 +102,6 @@ ifeq ($(ARCH), sparcv9)
- ifeq ($(ARCH), sparcv9)
- CPPFLAGS += -DX_ARCH=X_SPARCV9
- endif # ARCH sparcv9
--
--ifeq ($(ARCH), amd64)
-- CPPFLAGS += -DX_ARCH=X_AMD64
--endif # ARCH amd64
-
-
- # files needed for MIDI i/o
-diff -r 37a05a11f281 src/share/native/com/sun/media/sound/SoundDefs.h
---- a/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Sat Dec 01 00:00:00 2007 +0000
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Jan 23 14:39:17 2008 +0100
-@@ -33,11 +33,18 @@
- #define X_LINUX 3
-
- // types for X_ARCH
--#define X_I586 1
--#define X_SPARC 2
--#define X_SPARCV9 3
--#define X_IA64 4
--#define X_AMD64 5
-+#define X_ALPHA 1
-+#define X_AMD64 2
-+#define X_ARM 3
-+#define X_I586 4
-+#define X_IA64 5
-+#define X_MIPS 6
-+#define X_PPC 7
-+#define X_PPC64 8
-+#define X_S390 9
-+#define X_S390X 10
-+#define X_SPARC 11
-+#define X_SPARCV9 12
-
- // **********************************
- // Make sure you set X_PLATFORM and X_ARCH defines correctly.
-diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk 2007-11-09 14:12:27.000000000 +0000
-+++ openjdk/corba/make/common/Defs-linux.gmk 2007-11-09 14:13:45.000000000 +0000
-@@ -99,6 +99,10 @@
- LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
- CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
- LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
-+CFLAGS_REQUIRED_ppc += -m32
-+LDFLAGS_COMMON_ppc += -m32
-+CFLAGS_REQUIRED_ppc64 += -m64
-+LDFLAGS_COMMON_ppc64 += -m64
- CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
- LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
-
-diff -ru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk-ecj/corba/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2007-11-09 14:12:27.000000000 +0000
-+++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2007-11-09 14:13:45.000000000 +0000
-@@ -74,13 +74,13 @@
- # sparc or sparcv9
- REQUIRED_CC_VER = 4.0
- REQUIRED_GCC_VER = 4.0.*
-- else
-- ifeq ($(ARCH_DATA_MODEL), 32)
-+ endif
-+ ifeq ($(ARCH), i586)
- # i586
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 3.2.1*
- REQUIRED_GCC_VER_INT = 3.2.1-7a
-- else
-+ endif
- ifeq ($(ARCH), amd64)
- # amd64
- REQUIRED_CC_VER = 3.2
-@@ -91,7 +91,10 @@
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 2.9[56789].*
- endif
-- endif
-+ ifneq ("$(findstring ppc,$(ARCH))", "")
-+ # ppc or ppc64
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
- endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
-diff -ru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk-ecj/corba/make/common/shared/Platform.gmk
---- openjdk.orig/corba/make/common/shared/Platform.gmk 2007-11-09 14:12:27.000000000 +0000
-+++ openjdk/corba/make/common/shared/Platform.gmk 2007-11-09 14:13:45.000000000 +0000
-@@ -214,9 +214,9 @@
- ARCH=sparcv9
- endif
- else
-- # i586 is 32-bit, amd64 is 64-bit
-+ # i586 and ppc are 32-bit, amd64 and ppc64 are 64-bit
- ifndef ARCH_DATA_MODEL
-- ifeq ($(ARCH), i586)
-+ ifneq ($(filter i586 ppc,$(ARCH)),)
- ARCH_DATA_MODEL=32
- else
- ARCH_DATA_MODEL=64
diff -r 49178a613301 patches/icedtea-zero-build.patch
--- a/patches/icedtea-zero-build.patch Wed Mar 26 04:57:38 2008 -0400
+++ b/patches/icedtea-zero-build.patch Wed Mar 26 04:58:27 2008 -0400
@@ -130,3 +130,169 @@ diff -ru openjdk-ecj/hotspot/build/linux
LINK_VM = $(LINK_LIB.c)
+diff -r c9fa8e3d5aa2 openjdk/jdk/make/common/Defs-linux.gmk
+--- openjdk/jdk/make/common/Defs-linux.gmk Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk Thu Mar 20 13:45:05 2008 +0000
+@@ -109,8 +109,13 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+ LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
+-CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
+-LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
++ifdef ICEDTEA_ZERO_BUILD
++ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
++ LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
++else
++ CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
++ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
++endif
+
+ # Add in platform specific optimizations for all opt levels
+ CC_HIGHEST_OPT += $(_OPT_$(ARCH))
+diff -r c9fa8e3d5aa2 openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk Thu Mar 20 13:48:12 2008 +0000
+@@ -70,6 +70,11 @@ ifeq ($(PLATFORM), linux)
+ else
+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ endif
++ ifdef ICEDTEA_ZERO_BUILD
++ # zero
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ else
+ ifneq ("$(findstring sparc,$(ARCH))", "")
+ # sparc or sparcv9
+ REQUIRED_CC_VER = 4.0
+@@ -90,6 +95,7 @@ ifeq ($(PLATFORM), linux)
+ # ia64
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 2.9[56789].*
++ endif
+ endif
+ endif
+ endif
+diff -r c9fa8e3d5aa2 openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk/jdk/make/common/shared/Platform.gmk Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/jdk/make/common/shared/Platform.gmk Thu Mar 20 13:59:46 2008 +0000
+@@ -213,6 +213,11 @@ ifeq ($(SYSTEM_UNAME), Linux)
+ ARCH_FAMILY := $(ARCH)
+
+ # Linux builds may be 32-bit or 64-bit data model.
++ ifdef ICEDTEA_ZERO_BUILD
++ ifndef ARCH_DATA_MODEL
++ ARCH_DATA_MODEL = $(ZERO_BITSPERWORD)
++ endif
++ endif
+ ifeq ($(ARCH), sparc)
+ # Linux sparc build can be either 32-bit or 64-bit.
+ # Default to 32, but allow explicit setting to 32 or 64.
+diff -r c9fa8e3d5aa2 openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- openjdk/jdk/make/javax/sound/SoundDefs.gmk Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk Thu Mar 20 14:11:46 2008 +0000
+@@ -55,21 +55,25 @@ ifeq ($(PLATFORM), solaris)
+
+ endif # PLATFORM solaris
+
+-ifeq ($(ARCH), i586)
+- CPPFLAGS += -DX_ARCH=X_I586
+-endif # ARCH i586
++ifdef ICEDTEA_ZERO_BUILD
++ CPPFLAGS += -DX_ARCH=X_ZERO
++else
++ ifeq ($(ARCH), i586)
++ CPPFLAGS += -DX_ARCH=X_I586
++ endif # ARCH i586
+
+-ifeq ($(ARCH), sparc)
+- CPPFLAGS += -DX_ARCH=X_SPARC
+-endif # ARCH sparc
++ ifeq ($(ARCH), sparc)
++ CPPFLAGS += -DX_ARCH=X_SPARC
++ endif # ARCH sparc
+
+-ifeq ($(ARCH), sparcv9)
+- CPPFLAGS += -DX_ARCH=X_SPARCV9
+-endif # ARCH sparcv9
++ ifeq ($(ARCH), sparcv9)
++ CPPFLAGS += -DX_ARCH=X_SPARCV9
++ endif # ARCH sparcv9
+
+-ifeq ($(ARCH), amd64)
+- CPPFLAGS += -DX_ARCH=X_AMD64
+-endif # ARCH amd64
++ ifeq ($(ARCH), amd64)
++ CPPFLAGS += -DX_ARCH=X_AMD64
++ endif # ARCH amd64
++endif
+
+
+ # files needed for MIDI i/o
+diff -r c9fa8e3d5aa2 openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Thu Mar 20 14:14:29 2008 +0000
+@@ -38,6 +38,7 @@
+ #define X_SPARCV9 3
+ #define X_IA64 4
+ #define X_AMD64 5
++#define X_ZERO 6
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
+diff -r c9fa8e3d5aa2 openjdk/corba/make/common/Defs-linux.gmk
+--- openjdk/corba/make/common/Defs-linux.gmk Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/corba/make/common/Defs-linux.gmk Thu Mar 20 13:57:50 2008 +0000
+@@ -99,8 +99,13 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+ LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
+-CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
+-LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
++ifdef ICEDTEA_ZERO_BUILD
++ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
++ LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
++else
++ CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
++ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
++endif
+
+ # Add in platform specific optimizations for all opt levels
+ CC_HIGHEST_OPT += $(_OPT_$(ARCH))
+diff -r c9fa8e3d5aa2 openjdk/corba/make/common/shared/Compiler-gcc.gmk
+--- openjdk/corba/make/common/shared/Compiler-gcc.gmk Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk Thu Mar 20 13:59:09 2008 +0000
+@@ -70,6 +70,11 @@ ifeq ($(PLATFORM), linux)
+ else
+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ endif
++ ifdef ICEDTEA_ZERO_BUILD
++ # zero
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ else
+ ifneq ("$(findstring sparc,$(ARCH))", "")
+ # sparc or sparcv9
+ REQUIRED_CC_VER = 4.0
+@@ -90,6 +95,7 @@ ifeq ($(PLATFORM), linux)
+ # ia64
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 2.9[56789].*
++ endif
+ endif
+ endif
+ endif
+diff -r c9fa8e3d5aa2 openjdk/corba/make/common/shared/Platform.gmk
+--- openjdk/corba/make/common/shared/Platform.gmk Thu Mar 20 13:42:48 2008 +0000
++++ openjdk/corba/make/common/shared/Platform.gmk Thu Mar 20 13:59:53 2008 +0000
+@@ -202,6 +202,11 @@ ifeq ($(SYSTEM_UNAME), Linux)
+ ARCH_FAMILY := $(ARCH)
+
+ # Linux builds may be 32-bit or 64-bit data model.
++ ifdef ICEDTEA_ZERO_BUILD
++ ifndef ARCH_DATA_MODEL
++ ARCH_DATA_MODEL = $(ZERO_BITSPERWORD)
++ endif
++ endif
+ ifeq ($(ARCH), sparc)
+ # Linux sparc build can be either 32-bit or 64-bit.
+ # Default to 32, but allow explicit setting to 32 or 64.
diff -r 49178a613301 ports/jdk/src/solaris/bin/alpha/jvm.cfg
--- a/ports/jdk/src/solaris/bin/alpha/jvm.cfg Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# @(#)jvm.cfg 1.7 07/05/05
-#
-#
-# Copyright 2002-2003 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.
-#
-#
-#
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--core KNOWN
--client IGNORE
--server IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff -r 49178a613301 ports/jdk/src/solaris/bin/arm/jvm.cfg
--- a/ports/jdk/src/solaris/bin/arm/jvm.cfg Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# @(#)jvm.cfg 1.7 07/05/05
-#
-#
-# Copyright 2002-2003 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.
-#
-#
-#
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--core KNOWN
--client IGNORE
--server IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff -r 49178a613301 ports/jdk/src/solaris/bin/ergo_alpha.c
--- a/ports/jdk/src/solaris/bin/ergo_alpha.c Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * 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 ports/jdk/src/solaris/bin/ergo_arm.c
--- a/ports/jdk/src/solaris/bin/ergo_arm.c Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * 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 ports/jdk/src/solaris/bin/ergo_ia64.c
--- a/ports/jdk/src/solaris/bin/ergo_ia64.c Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * 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 ports/jdk/src/solaris/bin/ergo_mips.c
--- a/ports/jdk/src/solaris/bin/ergo_mips.c Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * 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 ports/jdk/src/solaris/bin/ergo_ppc.c
--- a/ports/jdk/src/solaris/bin/ergo_ppc.c Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * 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 ports/jdk/src/solaris/bin/ergo_s390.c
--- a/ports/jdk/src/solaris/bin/ergo_s390.c Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * 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 ports/jdk/src/solaris/bin/mips/jvm.cfg
--- a/ports/jdk/src/solaris/bin/mips/jvm.cfg Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# @(#)jvm.cfg 1.7 07/05/05
-#
-#
-# Copyright 2002-2003 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.
-#
-#
-#
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--core KNOWN
--client IGNORE
--server IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff -r 49178a613301 ports/jdk/src/solaris/bin/ppc/jvm.cfg
--- a/ports/jdk/src/solaris/bin/ppc/jvm.cfg Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# @(#)jvm.cfg 1.7 07/05/05
-#
-#
-# Copyright 2002-2003 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.
-#
-#
-#
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--core KNOWN
--client IGNORE
--server IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff -r 49178a613301 ports/jdk/src/solaris/bin/ppc64/jvm.cfg
--- a/ports/jdk/src/solaris/bin/ppc64/jvm.cfg Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# @(#)jvm.cfg 1.7 07/05/05
-#
-#
-# Copyright 2002-2003 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.
-#
-#
-#
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--core KNOWN
--client IGNORE
--server IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff -r 49178a613301 ports/jdk/src/solaris/bin/s390/jvm.cfg
--- a/ports/jdk/src/solaris/bin/s390/jvm.cfg Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# @(#)jvm.cfg 1.7 07/05/05
-#
-#
-# Copyright 2002-2003 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.
-#
-#
-#
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--core KNOWN
--client IGNORE
--server IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff -r 49178a613301 ports/jdk/src/solaris/bin/s390x/jvm.cfg
--- a/ports/jdk/src/solaris/bin/s390x/jvm.cfg Wed Mar 26 04:57:38 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# @(#)jvm.cfg 1.7 07/05/05
-#
-#
-# Copyright 2002-2003 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.
-#
-#
-#
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--core KNOWN
--client IGNORE
--server IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
More information about the distro-pkg-dev
mailing list