Zero patch rearrangement in icedtea6
Gary Benson
gbenson at redhat.com
Tue Dec 8 01:45:08 PST 2009
Hi all,
This commit represents the changes documented below.
Cheers,
Gary
Gary Benson wrote:
> Hi all,
>
> At some point Zero is going to end up in a HSX tarball, and no doubt
> shortly afterwards in icedtea6. I've been working on a refactoring
> that will make the transition easier to manage.
>
> The attached patch replaces the various individual Zero patches with
> larger patches numbered with the Sun bug id that they were committed
> to OpenJDK7 with. This means that, once that bug's code ends up in
> an HSX tarball, we can simply remove one patch to fix IcedTea. It
> also means that, if OpenJDK 6 is about to rebase on a new HotSpot,
> we have patches ready made for the non-HotSpot Zero stuff that needs
> to be in that tarball.
>
> As well as the above, the attached patch upgrades icedtea6's Zero
> from the original, IcedTea way of building Zero to the new, much
> nicer OpenJDK7 way of doing it. This means that dependencies
> between header files are better tracked, thanks to the new
> includeDB, and also that there are now no differences between
> icedtea6's Zero and OpenJDK7's except for Ed's interpreter and the
> odd little bit here and there that's required for the newer HotSpot.
>
> I'm currently testing this with a bunch of different configurations
> (amd64/zero, ppc/shark, ppc64/hs16/zero and s390x/zero). Could
> people please test this patch on the configurations they care about,
> to make sure I didn't break anything.
>
> Thanks (and have a good weekend!)
> Gary
>
> --
> http://gbenson.net/
-------------- next part --------------
diff -r c18ada9920f7 ChangeLog
--- a/ChangeLog Mon Dec 07 11:11:29 2009 -0500
+++ b/ChangeLog Tue Dec 08 09:36:55 2009 +0000
@@ -1,3 +1,63 @@
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_CORE_BUILD): Removed.
+ (ICEDTEA_ZERO_BUILD): Set to "yes" instead of "true".
+ (ICEDTEA_ENV): Removed ICEDTEA_CORE_BUILD, replaced
+ ICEDTEA_ZERO_BUILD with ZERO_BUILD, and replaced ZERO_BITSPERWORD
+ with ARCH_DATA_MODEL.
+ (ICEDTEA_ENV_ECJ): Likewise.
+ (stamps/ports.stamp): Updated paths, and don't make jvm.cfg or
+ ergo_$arch.c for Zero.
+ (ICEDTEA_PATCHES): Added new patches and removed old ones.
+
+ * acinclude.m4
+ (ENABLE_ZERO_BUILD): Removed old CORE_BUILD stuff.
+ (SET_CORE_OR_SHARK_BUILD): Replaced with...
+ (SET_SHARK_BUILD): New macro.
+
+ * configure.ac: Use SET_SHARK_BUILD before ENABLE_ZERO_BUILD in
+ place of SET_CORE_OR_SHARK_BUILD after it.
+
+ * patches/zero/6890308.patch: New file.
+ * patches/zero/6891677.patch: Likewise.
+
+ * patches/icedtea-core-build.patch: Removed.
+ * patches/icedtea-core-build-hotspot.patch: Likewise.
+ * patches/icedtea-linker-options.patch: Likewise.
+ * patches/icedtea-signature-iterator.patch: Likewise.
+ * patches/icedtea-static-libstdc++.patch: Likewise.
+ * patches/icedtea-zero.patch: Likewise.
+ * patches/icedtea-zero-build.patch: Likewise.
+ * patches/icedtea-zero-build-hotspot.patch: Likewise.
+
+ * patches/ecj/icedtea-hotspot.patch: Updated.
+ * patches/icedtea-shark-build.patch: Likewise.
+ * patches/icedtea-shark-build-hotspot.patch: Likewise.
+
+ * patches/icedtea-arch.patch: Fixed up.
+ * patches/icedtea-libraries.patch: Likewise.
+ * patches/icedtea-shark.patch: Likewise.
+
+ * ports/hotspot/build/linux/makefiles/shark.make: Moved to...
+ * ports/hotspot/make/linux/makefiles/shark.make: New file.
+
+ * ports/hotspot/build/linux/makefiles/zero.make: Moved to...
+ * ports/hotspot/make/linux/makefiles/zeroshark.make: New file.
+
+ * ports/hotspot/make/linux/makefiles/zero.make: New file.
+ * ports/hotspot/src/share/vm/includeDB_zero: Likewise.
+
+ * ports/hotspot/make/linux/platform_zero.in: Removed.
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Sync with upstream.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Fixed up.
+
2009-12-07 Gary Benson <gbenson at redhat.com>
PR icedtea/416:
diff -r c18ada9920f7 Makefile.am
--- a/Makefile.am Mon Dec 07 11:11:29 2009 -0500
+++ b/Makefile.am Tue Dec 08 09:36:55 2009 +0000
@@ -145,13 +145,8 @@
$(ICEDTEA_BOOT_DIR)/lib/endorsed
JDK_UPDATE_VERSION = 0
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-if CORE_BUILD
- ICEDTEA_CORE_BUILD = yes
-else
- ICEDTEA_CORE_BUILD =
-endif
if ZERO_BUILD
- ICEDTEA_ZERO_BUILD = yes
+ ICEDTEA_ZERO_BUILD = true
else
ICEDTEA_ZERO_BUILD =
endif
@@ -180,11 +175,10 @@
ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
- ICEDTEA_CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
- ICEDTEA_ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
+ ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
- ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
+ ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -265,11 +259,10 @@
CLASSPATH="" \
LD_LIBRARY_PATH="" \
GENSRCDIR="$(abs_top_builddir)/generated" \
- ICEDTEA_CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
- ICEDTEA_ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
+ ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
- ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
+ ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -491,21 +484,20 @@
# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/make/*/platform_zero.in \
+ $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/tools \
$(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
cp -rv $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/$(HOTSPOT_MAKE_DIR)/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
- = "xno" ; then \
+ if ! test "x$(WITH_CACAO)" = "xno" ; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
ln -sf $(abs_top_builddir)/jvm.cfg \
openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg ; \
fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+ if ! test "x$(WITH_CACAO)" = "xno"; then \
ln -sf $(abs_top_builddir)/ergo.c \
openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
@@ -515,10 +507,10 @@
ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
+ patches/zero/6890308.patch \
+ patches/zero/6891677.patch \
patches/icedtea-notice-safepoints.patch \
- patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
- patches/icedtea-zero.patch \
patches/icedtea-ia64-bugfix.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
@@ -544,15 +536,9 @@
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-core-build.patch \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-lcms.patch \
- patches/icedtea-core-build-hotspot.patch \
- patches/icedtea-linker-options.patch \
- patches/icedtea-static-libstdc++.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-zero-build.patch \
- patches/icedtea-zero-build-hotspot.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
diff -r c18ada9920f7 acinclude.m4
--- a/acinclude.m4 Mon Dec 07 11:11:29 2009 -0500
+++ b/acinclude.m4 Tue Dec 08 09:36:55 2009 +0000
@@ -691,82 +691,78 @@
esac
],
[
- case "${host}" in
- i?86-*-*) ;;
- sparc*-*-*) ;;
- x86_64-*-*) ;;
- *)
- if test "x${WITH_CACAO}" != xno; then
- use_zero=no
- else
- use_zero=yes
- fi
- ;;
- esac
+ if test "x${use_shark}" = "xyes"; then
+ use_zero=yes;
+ else
+ case "${host}" in
+ i?86-*-*) ;;
+ sparc*-*-*) ;;
+ x86_64-*-*) ;;
+ *)
+ if test "x${WITH_CACAO}" != xno; then
+ use_zero=no
+ else
+ use_zero=yes
+ fi
+ ;;
+ esac
+ fi
])
AC_MSG_RESULT($use_zero)
AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes)
- ZERO_LIBARCH=
- ZERO_BITSPERWORD=
- ZERO_ENDIANNESS=
- ZERO_ARCHDEF=
- ZERO_ARCHFLAG=
- if test "x${use_zero}" = xyes; then
- ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
- dnl can't use AC_CHECK_SIZEOF on multilib
- case "${ZERO_LIBARCH}" in
- i386|ppc|s390|sparc)
- ZERO_BITSPERWORD=32
- ;;
- amd64|ppc64|s390x|sparc64)
- ZERO_BITSPERWORD=64
- ;;
- *)
- AC_CHECK_SIZEOF(void *)
- ZERO_BITSPERWORD=`expr "${ac_cv_sizeof_void_p}" "*" 8`
- esac
- AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"])
- case "${ZERO_LIBARCH}" in
- i386)
- ZERO_ARCHDEF="IA32"
- ;;
- ppc*)
- ZERO_ARCHDEF="PPC"
- ;;
- s390*)
- ZERO_ARCHDEF="S390"
- ;;
- sparc*)
- ZERO_ARCHDEF="SPARC"
- ;;
- *)
- ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z`
- esac
- dnl multilib machines need telling which mode to build for
- case "${ZERO_LIBARCH}" in
- i386|ppc|sparc)
- ZERO_ARCHFLAG="-m32"
- ;;
- s390)
- ZERO_ARCHFLAG="-m31"
- ;;
- amd64|ppc64|s390x|sparc64)
- ZERO_ARCHFLAG="-m64"
- ;;
- esac
- fi
+ ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
+ dnl can't use AC_CHECK_SIZEOF on multilib
+ case "${ZERO_LIBARCH}" in
+ i386|ppc|s390|sparc)
+ ZERO_BITSPERWORD=32
+ ;;
+ amd64|ppc64|s390x|sparc64)
+ ZERO_BITSPERWORD=64
+ ;;
+ *)
+ AC_CHECK_SIZEOF(void *)
+ ZERO_BITSPERWORD=`expr "${ac_cv_sizeof_void_p}" "*" 8`
+ esac
+ AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"])
+ case "${ZERO_LIBARCH}" in
+ i386)
+ ZERO_ARCHDEF="IA32"
+ ;;
+ ppc*)
+ ZERO_ARCHDEF="PPC"
+ ;;
+ s390*)
+ ZERO_ARCHDEF="S390"
+ ;;
+ sparc*)
+ ZERO_ARCHDEF="SPARC"
+ ;;
+ *)
+ ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z`
+ esac
+ dnl multilib machines need telling which mode to build for
+ case "${ZERO_LIBARCH}" in
+ i386|ppc|sparc)
+ ZERO_ARCHFLAG="-m32"
+ ;;
+ s390)
+ ZERO_ARCHFLAG="-m31"
+ ;;
+ amd64|ppc64|s390x|sparc64)
+ ZERO_ARCHFLAG="-m64"
+ ;;
+ esac
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_OR_SHARK_BUILD],
+AC_DEFUN([SET_SHARK_BUILD],
[
AC_MSG_CHECKING(whether to use the Shark JIT)
shark_selected=no
@@ -781,20 +777,12 @@
esac
])
- use_core=no
use_shark=no
- if test "x${WITH_CACAO}" != "xno"; then
- use_core=yes
- elif test "x${use_zero}" = "xyes"; then
- if test "x${shark_selected}" = "xyes"; then
+ if test "x${shark_selected}" = "xyes"; then
use_shark=yes
- else
- use_core=yes
- fi
fi
AC_MSG_RESULT($use_shark)
- AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
])
diff -r c18ada9920f7 configure.ac
--- a/configure.ac Mon Dec 07 11:11:29 2009 -0500
+++ b/configure.ac Tue Dec 08 09:36:55 2009 +0000
@@ -245,8 +245,8 @@
AC_CHECK_WITH_CACAO_SRC_ZIP
AC_CHECK_WITH_CACAO_SRC_DIR
ENABLE_OPTIMIZATIONS
+SET_SHARK_BUILD
ENABLE_ZERO_BUILD
-SET_CORE_OR_SHARK_BUILD
ENABLE_HG
AC_CHECK_WITH_HG_REVISION
diff -r c18ada9920f7 generated/sun/misc/Version.java
--- a/generated/sun/misc/Version.java Mon Dec 07 11:11:29 2009 -0500
+++ b/generated/sun/misc/Version.java Tue Dec 08 09:36:55 2009 +0000
@@ -39,10 +39,10 @@
"OpenJDK Runtime Environment";
private static final String java_runtime_version =
- "1.6.0_0-b16";
+ "1.6.0_0-b17";
private static final String jdk_derivative_name =
- "IcedTea6 1.5-r84a527d1a06c";
+ "IcedTea6 1.7pre-r046c77dadfb3";
private static final String distro_package_version =
"";
diff -r c18ada9920f7 patches/ecj/icedtea-hotspot.patch
--- a/patches/ecj/icedtea-hotspot.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/ecj/icedtea-hotspot.patch Tue Dec 08 09:36:55 2009 +0000
@@ -1,7 +1,7 @@
diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
-@@ -263,28 +263,24 @@
+@@ -287,42 +287,36 @@
$(TARGETS_C2): $(SUBDIRS_C2)
cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -30,6 +30,20 @@
ifdef INSTALL
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
+
+ $(TARGETS_ZERO): $(SUBDIRS_ZERO)
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_SHARK): $(SUBDIRS_SHARK)
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
diff -r c18ada9920f7 patches/icedtea-arch.patch
--- a/patches/icedtea-arch.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/icedtea-arch.patch Tue Dec 08 09:36:55 2009 +0000
@@ -90,10 +90,10 @@
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig 2008-10-15 17:04:19.000000000 +0200
+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2008-10-15 17:11:28.000000000 +0200
-@@ -75,28 +75,56 @@
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 3.2.*
+@@ -70,28 +70,56 @@
else
+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ endif
- ifneq ("$(findstring sparc,$(ARCH))", "")
- # sparc or sparcv9
- REQUIRED_CC_VER = 4.0
@@ -155,8 +155,8 @@
+ REQUIRED_CC_VER = 4.0
+ REQUIRED_GCC_VER = 4.0.*
endif
- endif
# Option used to create a shared library
+ SHARED_LIBRARY_FLAG = -shared -mimpure-text
--- openjdk/jdk/make/common/shared/Platform.gmk.orig 2008-10-15 17:04:19.000000000 +0200
+++ openjdk/jdk/make/common/shared/Platform.gmk 2008-10-15 17:13:49.000000000 +0200
@@ -237,9 +237,40 @@
diff -r c18ada9920f7 patches/icedtea-core-build-hotspot.patch
--- a/patches/icedtea-core-build-hotspot.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
- endif
- endif
-+endif
-diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/Makefile 2008-06-22 03:10:05.000000000 +0100
-@@ -91,6 +91,15 @@
- all_debug: jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
-
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore: all_productcore all_fastdebugcore
-+all_productcore: productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore: jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world: all create_jdk
-
-@@ -113,6 +122,10 @@
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
-
-+$(CORE_VM_TARGETS):
-+ $(CD) $(GAMMADIR)/make; \
-+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- $(MAKE_ARGS) $(VM_TARGET)
- endif
-
-+generic_buildcore:
-+ $(MKDIR) -p $(OUTPUTDIR)
-+ $(CD) $(OUTPUTDIR); \
-+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
-+ $(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- $(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef ICEDTEA_CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
- KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
-
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef ICEDTEA_CORE_BUILD
-+ MISC_DIR=$(C2_DIR)
-+ GEN_DIR=$(C2_BASE_DIR)/generated
-+else
- ifeq ($(ARCH_DATA_MODEL), 32)
- MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -219,6 +246,7 @@
- MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
- endif
-+endif
-
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 22:28:30.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-06-22 03:10:05.000000000 +0100
-@@ -94,8 +94,12 @@
- #ifdef TIERED
- #define VMTYPE "Server"
- #else
-- #define VMTYPE COMPILER1_PRESENT("Client") \
-- COMPILER2_PRESENT("Server")
-+#if defined(COMPILER1) || defined(COMPILER2)
-+ #define VMTYPE COMPILER1_PRESENT("Client") \
-+ COMPILER2_PRESENT("Server")
-+#else
-+ #define VMTYPE "Core"
-+#endif // COMPILER1 || COMPILER2
- #endif // TIERED
- #endif // KERNEL
-
-
diff -r c18ada9920f7 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-diff -ru openjdk.orig/control/make/make/hotspot-rules.gmk openjdk/control/make/hotspot-rules.gmk
---- openjdk.orig/control/make/make/hotspot-rules.gmk 2007-10-12 08:45:09.000000000 +0100
-+++ openjdk/make/hotspot-rules.gmk 2007-11-08 09:40:57.000000000 +0000
-@@ -72,6 +72,10 @@
- HOTSPOT_TARGET = all_fastdebug
- endif
-
-+ifdef ICEDTEA_CORE_BUILD
-+ HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
-+endif
-+
- HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
-diff -ru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
---- openjdk.orig/jdk/make/java/redist/Makefile 2008-01-31 14:20:37.000000000 +0000
-+++ openjdk/jdk/make/java/redist/Makefile 2008-02-04 10:11:04.000000000 +0000
-@@ -95,9 +95,11 @@ endif # INCLUDE_SA
- endif # INCLUDE_SA
-
- # Hotspot client is only available on 32-bit builds
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
- $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
-+endif
- endif
-
- ifeq ($(PLATFORM), windows)
-@@ -161,6 +163,7 @@ ifeq ($(PLATFORM), solaris)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
- endif
-
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
-
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-@@ -190,6 +193,8 @@ endif # 32bit solaris
- endif # 32bit solaris
-
- endif # 32bit
-+
-+endif # ICEDTEA_CORE_BUILD
-
- # NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
-
diff -r c18ada9920f7 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/icedtea-libraries.patch Tue Dec 08 09:36:55 2009 +0000
@@ -70,8 +70,8 @@
endif
endif
ifeq ($(PLATFORM), linux)
-- LDFLAGS += -z origin
-+ LDFLAGS += -lz -z origin
+- LDFLAGS += -Wl,-z -Wl,origin
++ LDFLAGS += -lz -Wl,-z -Wl,origin
LDFLAGS += -Wl,--allow-shlib-undefined
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
diff -r c18ada9920f7 patches/icedtea-linker-options.patch
--- a/patches/icedtea-linker-options.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk 2007-11-08 13:45:46.000000000 +0000
-+++ openjdk/corba/make/common/Defs-linux.gmk 2007-11-08 13:44:13.000000000 +0000
-@@ -196,7 +196,7 @@
-
- EXTRA_LIBS += -lc
-
--LDFLAGS_DEFS_OPTION = -z defs
-+LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
- LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
-
- #
-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 13:45:46.000000000 +0000
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2007-11-08 13:43:52.000000000 +0000
-@@ -204,7 +204,7 @@
-
- EXTRA_LIBS += -lc
-
--LDFLAGS_DEFS_OPTION = -z defs
-+LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
- LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
-
- #
-diff -ru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
---- openjdk.orig/jdk/make/common/Program.gmk 2007-11-08 13:45:46.000000000 +0000
-+++ openjdk/jdk/make/common/Program.gmk 2007-11-08 13:42:44.000000000 +0000
-@@ -85,7 +85,7 @@
- endif
- endif
- ifeq ($(PLATFORM), linux)
-- LDFLAGS += -lz -z origin
-+ LDFLAGS += -lz -Wl,-z -Wl,origin
- LDFLAGS += -Wl,--allow-shlib-undefined
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
-diff -ru openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
---- openjdk.orig/jdk/make/java/instrument/Makefile 2007-11-08 13:45:46.000000000 +0000
-+++ openjdk/jdk/make/java/instrument/Makefile 2007-11-08 13:42:25.000000000 +0000
-@@ -109,7 +109,7 @@
- LDFLAGS += -R \$$ORIGIN/jli
- endif
- ifeq ($(PLATFORM), linux)
-- LDFLAGS += -z origin
-+ LDFLAGS += -Wl,-z -Wl,origin
- LDFLAGS += -Wl,--allow-shlib-undefined
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
- endif
diff -r c18ada9920f7 patches/icedtea-shark-build-hotspot.patch
--- a/patches/icedtea-shark-build-hotspot.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/icedtea-shark-build-hotspot.patch Tue Dec 08 09:36:55 2009 +0000
@@ -1,9 +1,9 @@
diff -Nru openjdk.orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
--- openjdk.orig/hotspot/make/linux/Makefile 2008-07-03 08:39:52.000000000 +0100
+++ openjdk/hotspot/make/linux/Makefile 2008-07-13 00:59:03.000000000 +0100
-@@ -158,6 +158,13 @@
- # profiledcore core <os>_<arch>_core/profiled
- # productcore core <os>_<arch>_core/product
+@@ -168,6 +168,13 @@
+ # profiledzero zero <os>_<arch>_zero/profiled
+ # productzero zero <os>_<arch>_zero/product
#
+# debugshark shark <os>_<arch>_shark/debug
+# fastdebugshark shark <os>_<arch>_shark/fastdebug
@@ -15,61 +15,89 @@
# What you get with each target:
#
# debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
-@@ -176,11 +183,13 @@
- SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
+@@ -191,12 +198,14 @@
SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
-+SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(BUILDARCH)_shark/,$(TARGETS))
+ SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
++SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
TARGETS_C2 = $(TARGETS)
TARGETS_C1 = $(addsuffix 1,$(TARGETS))
TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
TARGETS_CORE = $(addsuffix core,$(TARGETS))
+ TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
+TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
-@@ -196,6 +205,7 @@
- @echo " $(TARGETS_C2)"
+@@ -213,6 +222,7 @@
@echo " $(TARGETS_C1)"
@echo " $(TARGETS_CORE)"
+ @echo " $(TARGETS_ZERO)"
+ @echo " $(TARGETS_SHARK)"
checks: check_os_version check_j2se_version
-@@ -245,6 +255,10 @@
+@@ -266,6 +276,10 @@
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
- $(BUILDTREE) VARIANT=core
+ $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
-+$(SUBDIRS_SHARK): $(BUILDTREE_MAKE)
++$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-+ $(BUILDTREE) VARIANT=shark
++ $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
+
- # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
+ platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
+ $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
- $(TARGETS_C2): $(SUBDIRS_C2)
-@@ -275,6 +289,12 @@
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+@@ -306,11 +320,19 @@
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
endif
+$(TARGETS_SHARK): $(SUBDIRS_SHARK)
-+ cd $(OSNAME)_$(BUILDARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
++ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
++ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
+ifdef INSTALL
-+ cd $(OSNAME)_$(BUILDARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
++ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
+endif
+
# Just build the tree, and nothing else:
tree: $(SUBDIRS_C2)
tree1: $(SUBDIRS_C1)
-@@ -305,7 +325,7 @@
+ treecore: $(SUBDIRS_CORE)
+ treezero: $(SUBDIRS_ZERO)
++treeshark: $(SUBDIRS_SHARK)
+
+ # Doc target. This is the same for all build options.
+ # Hence create a docs directory beside ...$(ARCH)_[...]
+@@ -327,20 +349,22 @@
+
+ zero: jvmgzero productzero
+
++shark: jvmgshark productshark
++
+ clean_docs:
+ rm -rf $(SUBDIR_DOCS)
+
+-clean_compiler1 clean_compiler2 clean_core clean_zero:
++clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark:
+ rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
+
+-clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs
++clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs
+
+ include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
#-------------------------------------------------------------------------------
--.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE)
-+.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_SHARK)
- .PHONY: tree tree1 treecore
- .PHONY: all compiler1 compiler2 core
- .PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs
+-.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
+-.PHONY: tree tree1 treecore treezero
+-.PHONY: all compiler1 compiler2 core zero
+-.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
++.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK)
++.PHONY: tree tree1 treecore treezero treeshark
++.PHONY: all compiler1 compiler2 core zero shark
++.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
+ .PHONY: checks check_os_version check_j2se_version
diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
--- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2008-07-13 00:38:03.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2008-07-13 00:59:03.000000000 +0100
@@ -84,22 +112,6 @@
\( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; > $@
Makefile: $(BUILDTREE_MAKE)
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-07-13 00:38:03.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-07-13 00:59:03.000000000 +0100
-@@ -118,6 +118,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
- ifndef ICEDTEA_CORE_BUILD
-+ifndef ICEDTEA_SHARK_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -133,3 +134,4 @@
- endif
- endif
- endif
-+endif
diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-07-13 00:38:03.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-07-13 00:59:03.000000000 +0100
@@ -116,11 +128,11 @@
diff -Nru openjdk.orig/hotspot/make/linux/makefiles/top.make openjdk/hotspot/make/linux/makefiles/top.make
--- openjdk.orig/hotspot/make/linux/makefiles/top.make 2008-07-03 08:39:53.000000000 +0100
+++ openjdk/hotspot/make/linux/makefiles/top.make 2008-07-13 00:59:03.000000000 +0100
-@@ -73,6 +73,7 @@
- Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
+@@ -75,6 +75,7 @@
Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
-+Include_DBs/SHARK = $(Include_DBs/CORE) $(VM)/includeDB_shark
+ Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero
++Include_DBs/SHARK = $(Include_DBs/ZERO) $(VM)/includeDB_shark
Include_DBs = $(Include_DBs/$(TYPE))
Cached_plat = $(GENERATED)/platform.current
@@ -158,13 +170,18 @@
diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
--- openjdk.orig/hotspot/make/Makefile 2008-07-13 00:38:02.000000000 +0100
+++ openjdk/hotspot/make/Makefile 2008-07-13 00:59:03.000000000 +0100
-@@ -103,6 +103,15 @@
- all_debugcore: jvmgcore docs export_debug
- all_optimizedcore: optimizedcore docs export_optimized
+@@ -85,6 +85,7 @@
+ C2_VM_TARGETS=product fastdebug optimized jvmg
+ KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
+ ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
++SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
-+# Shark (C0) targets made available with this Makefile
-+SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
-+
+ # JDK directory list
+ JDK_DIRS=bin include jre lib demo
+@@ -101,6 +102,12 @@
+ all_debugzero: jvmgzero docs export_debug
+ all_optimizedzero: optimizedzero docs export_optimized
+
+allshark: all_productshark all_fastdebugshark
+all_productshark: productshark docs export_product
+all_fastdebugshark: fastdebugshark docs export_fastdebug
@@ -174,18 +191,18 @@
# Do everything
world: all create_jdk
-@@ -129,6 +138,10 @@
+@@ -131,6 +138,10 @@
$(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
+ $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
+$(SHARK_VM_TARGETS):
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
+
- $(KERNEL_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -181,6 +194,12 @@
+ # Build compiler1 (client) rule, different for platforms
+ generic_build1:
+ $(MKDIR) -p $(OUTPUTDIR)
+@@ -197,6 +208,12 @@
$(MAKE) -f $(ABS_OS_MAKEFILE) \
$(MAKE_ARGS) $(VM_TARGET)
@@ -195,39 +212,55 @@
+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
+ $(MAKE_ARGS) $(VM_TARGET)
+
- generic_buildkernel:
- $(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -230,8 +249,12 @@
- ifdef ICEDTEA_CORE_BUILD
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
- else
-+ifdef ICEDTEA_SHARK_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
-+else
+ # Export file rule
+ generic_export: $(EXPORT_LIST)
+ export_product:
+@@ -228,15 +245,22 @@
C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
- endif
-+endif
KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
+ ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
++SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
-@@ -242,6 +265,10 @@
- MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
+ KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
+ ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
++SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
+
+ # Misc files and generated files need to come from C1 or C2 area
+ ifeq ($(ZERO_BUILD), true)
++ifdef ICEDTEA_SHARK_BUILD
++ MISC_DIR=$(SHARK_DIR)
++ GEN_DIR=$(SHARK_BASE_DIR)/generated
++else
+ MISC_DIR=$(ZERO_DIR)
+ GEN_DIR=$(ZERO_BASE_DIR)/generated
++endif
else
-+ifdef ICEDTEA_SHARK_BUILD
-+ MISC_DIR=$(C2_DIR)
-+ GEN_DIR=$(C2_BASE_DIR)/generated
-+else
ifeq ($(ARCH_DATA_MODEL), 32)
MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -250,6 +277,7 @@
- GEN_DIR=$(C2_BASE_DIR)/generated
- endif
- endif
-+endif
-
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
-
+@@ -290,10 +314,17 @@
+ # Shared Library
+ ifneq ($(OSNAME),windows)
+ ifeq ($(ZERO_BUILD), true)
++ ifdef ICEDTEA_SHARK_BUILD
++$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
++ $(install-file)
++$(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so
++ $(install-file)
++ else
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so
+ $(install-file)
++ endif
+ else
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+ $(install-file)
+@@ -345,6 +376,7 @@
+ $(RM) -r $(C2_DIR)
+ $(RM) -r $(KERNEL_DIR)
+ $(RM) -r $(ZERO_DIR)
++ $(RM) -r $(SHARK_DIR)
+ clean_export:
+ $(RM) -r $(EXPORT_PATH)
+ clean_jdk:
diff -r c18ada9920f7 patches/icedtea-shark-build.patch
--- a/patches/icedtea-shark-build.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/icedtea-shark-build.patch Tue Dec 08 09:36:55 2009 +0000
@@ -1,45 +1,16 @@
diff -r 8e41d25d7665 openjdk/control/make/make/hotspot-rules.gmk
--- openjdk/control/make/make/hotspot-rules.gmk Fri Jun 20 13:26:10 2008 +0100
+++ openjdk/make/hotspot-rules.gmk Fri Jun 20 13:26:20 2008 +0100
-@@ -75,6 +75,9 @@ ifdef ICEDTEA_CORE_BUILD
- ifdef ICEDTEA_CORE_BUILD
- HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
+@@ -73,7 +73,11 @@
endif
-+ifdef ICEDTEA_SHARK_BUILD
-+ HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
-+endif
+
+ ifeq ($(ZERO_BUILD), true)
+- HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
++ ifdef ICEDTEA_SHARK_BUILD
++ HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
++ else
++ HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
++ endif
+ endif
HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
-iff -r 8e41d25d7665 openjdk/jdk/make/java/redist/Makefile
---- openjdk/jdk/make/java/redist/Makefile Fri Jun 20 13:26:10 2008 +0100
-+++ openjdk/jdk/make/java/redist/Makefile Fri Jun 20 13:28:19 2008 +0100
-@@ -96,9 +96,11 @@ endif # INCLUDE_SA
-
- # Hotspot client is only available on 32-bit builds
- ifndef ICEDTEA_CORE_BUILD
-+ifndef ICEDTEA_SHARK_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
- $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
-+endif
- endif
- endif
-
-@@ -164,6 +166,7 @@ endif
- endif
-
- ifndef ICEDTEA_CORE_BUILD
-+ifndef ICEDTEA_SHARK_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
-
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-@@ -193,6 +196,8 @@ endif # 32bit solaris
- endif # 32bit solaris
-
- endif # 32bit
-+
-+endif # ICEDTEA_SHARK_BUILD
-
- endif # ICEDTEA_CORE_BUILD
-
diff -r c18ada9920f7 patches/icedtea-shark.patch
--- a/patches/icedtea-shark.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/icedtea-shark.patch Tue Dec 08 09:36:55 2009 +0000
@@ -58,24 +58,18 @@
--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-03 14:23:37.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-03 14:33:48.000000000 +0000
-@@ -94,6 +94,9 @@
- #ifdef TIERED
+@@ -95,7 +95,11 @@
#define VMTYPE "Server"
- #else
+ #else // TIERED
+ #ifdef ZERO
+#ifdef SHARK
+ #define VMTYPE "Shark"
-+#else
- #if defined(COMPILER1) || defined(COMPILER2)
++#else // SHARK
+ #define VMTYPE "Zero"
++#endif // SHARK
+ #else // ZERO
#define VMTYPE COMPILER1_PRESENT("Client") \
COMPILER2_PRESENT("Server")
-@@ -104,6 +107,7 @@
- #define VMTYPE "Core"
- #endif // ZERO
- #endif // COMPILER1 || COMPILER2
-+#endif // SHARK
- #endif // TIERED
- #endif // KERNEL
-
--- openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp.orig 2008-11-22 00:11:18.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp 2008-12-03 14:33:48.000000000 +0000
@@ -229,6 +229,7 @@
diff -r c18ada9920f7 patches/icedtea-signature-iterator.patch
--- a/patches/icedtea-signature-iterator.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-diff -r ee6af95bc459 openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp
---- openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp Fri Nov 02 09:42:25 2007 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp Fri Nov 02 09:44:37 2007 +0000
-@@ -281,7 +281,7 @@ class MaskFillerForNative: public Native
- public:
- void pass_int() { /* ignore */ }
- void pass_long() { /* ignore */ }
--#ifdef _LP64
-+#if defined(_LP64) || defined(ZERO)
- void pass_float() { /* ignore */ }
- #endif
- void pass_double() { /* ignore */ }
-diff -r ee6af95bc459 openjdk/hotspot/src/share/vm/runtime/signature.hpp
---- openjdk/hotspot/src/share/vm/runtime/signature.hpp Fri Nov 02 09:42:25 2007 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/signature.hpp Fri Nov 02 09:48:28 2007 +0000
-@@ -275,11 +275,14 @@ class NativeSignatureIterator: public Si
-
- void do_bool () { pass_int(); _jni_offset++; _offset++; }
- void do_char () { pass_int(); _jni_offset++; _offset++; }
-+#if defined(_LP64) || defined(ZERO)
-+ void do_float () { pass_float(); _jni_offset++; _offset++; }
-+#else
-+ void do_float () { pass_int(); _jni_offset++; _offset++; }
-+#endif
- #ifdef _LP64
-- void do_float () { pass_float(); _jni_offset++; _offset++; }
- void do_double() { pass_double(); _jni_offset++; _offset += 2; }
- #else
-- void do_float () { pass_int(); _jni_offset++; _offset++; }
- void do_double() { pass_double(); _jni_offset += 2; _offset += 2; }
- #endif
- void do_byte () { pass_int(); _jni_offset++; _offset++; }
-@@ -303,8 +306,10 @@ class NativeSignatureIterator: public Si
- virtual void pass_int() = 0;
- virtual void pass_long() = 0;
- virtual void pass_object() = 0;
-+#if defined(_LP64) || defined(ZERO)
-+ virtual void pass_float() = 0;
-+#endif
- #ifdef _LP64
-- virtual void pass_float() = 0;
- virtual void pass_double() = 0;
- #else
- virtual void pass_double() { pass_long(); } // may be same as long
diff -r c18ada9920f7 patches/icedtea-static-libstdc++.patch
--- a/patches/icedtea-static-libstdc++.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2008-05-16 22:13:31.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/vm.make 2008-05-23 23:25:47.000000000 +0100
-@@ -124,6 +124,12 @@
-
- STATIC_CXX = true
-
-+ifeq ($(ZERO_LIBARCH), ppc64)
-+ STATIC_CXX = false
-+else
-+ STATIC_CXX = true
-+endif
-+
- ifeq ($(LINK_INTO),AOUT)
- LIBJVM.o =
- LIBJVM_MAPFILE =
diff -r c18ada9920f7 patches/icedtea-zero-build-hotspot.patch
--- a/patches/icedtea-zero-build-hotspot.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/defs.make openjdk/hotspot/make/defs.make
---- openjdk.orig/hotspot/make/defs.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/defs.make 2008-11-29 02:14:15.000000000 +0000
-@@ -192,13 +192,14 @@
-
- # Use uname output for SRCARCH, but deal with platform differences. If ARCH
- # is not explicitly listed below, it is treated as x86.
-- SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64,$(ARCH)))
-+ SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH)))
- ARCH/ = x86
- ARCH/sparc = sparc
- ARCH/sparc64= sparc
- ARCH/ia64 = ia64
- ARCH/amd64 = x86
- ARCH/x86_64 = x86
-+ ARCH/zero = zero
-
- # BUILDARCH is usually the same as SRCARCH, except for sparcv9
- BUILDARCH = $(SRCARCH)
-@@ -222,8 +223,9 @@
- LIBARCH/sparc = sparc
- LIBARCH/sparcv9 = sparcv9
- LIBARCH/ia64 = ia64
-+ LIBARCH/zero = $(ZERO_LIBARCH)
-
-- LP64_ARCH = sparcv9 amd64 ia64
-+ LP64_ARCH = sparcv9 amd64 ia64 zero
- endif
-
- # Required make macro settings for all platforms
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2008-11-29 02:14:15.000000000 +0000
-@@ -321,6 +321,7 @@
- DATA_MODE/sparcv9 = 64
- DATA_MODE/amd64 = 64
- DATA_MODE/ia64 = 64
-+DATA_MODE/zero = $(ZERO_BITSPERWORD)
-
- JAVA_FLAG/32 = -d32
- JAVA_FLAG/64 = -d64
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-11-29 01:55:52.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-11-29 02:14:15.000000000 +0000
-@@ -37,6 +37,18 @@
- ARCH_DATA_MODEL ?= 32
- endif
-
-+# zero
-+ifdef ICEDTEA_ZERO_BUILD
-+ ARCH_DATA_MODEL = $(ZERO_BITSPERWORD)
-+ ifeq ($(ARCH_DATA_MODEL), 64)
-+ MAKE_ARGS += LP64=1
-+ endif
-+ PLATFORM = linux-zero
-+ VM_PLATFORM = linux_zero
-+ HS_ARCH = zero
-+ ARCH = zero
-+endif
-+
- # ia64
- ifeq ($(ARCH), ia64)
- ARCH_DATA_MODEL = 64
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-11-29 01:55:52.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-11-29 02:14:15.000000000 +0000
-@@ -56,6 +56,9 @@
- VM_PICFLAG/AOUT =
- VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-
-+ifdef ICEDTEA_ZERO_BUILD
-+CFLAGS += $(LIBFFI_CFLAGS)
-+endif
- CFLAGS += $(VM_PICFLAG)
- CFLAGS += -fno-rtti
- CFLAGS += -fno-exceptions
-@@ -72,6 +75,7 @@
- ARCHFLAG/ia64 =
- ARCHFLAG/sparc = -m32 -mcpu=v9
- ARCHFLAG/sparcv9 = -m64 -mcpu=v9
-+ARCHFLAG/zero = $(ZERO_ARCHFLAG)
-
- CFLAGS += $(ARCHFLAG)
- AOUT_FLAGS += $(ARCHFLAG)
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make
---- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/sa.make 2008-11-29 02:14:15.000000000 +0000
-@@ -52,10 +52,10 @@
- SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
-
- # if $(AGENT_DIR) does not exist, we don't build SA
--# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium or zero.
-
- all:
-- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+ if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
- $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
- fi
-
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make 2008-11-29 02:14:15.000000000 +0000
-@@ -44,10 +44,10 @@
- DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
-
- # if $(AGENT_DIR) does not exist, we don't build SA
--# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium or zero.
-
- checkAndBuildSA:
-- $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+ $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
- $(MAKE) -f vm.make $(LIBSAPROC); \
- fi
-
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2008-11-29 01:55:52.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/vm.make 2008-11-29 02:14:15.000000000 +0000
-@@ -158,6 +158,9 @@
-
- LIBS_VM += $(LIBS)
- endif
-+ifdef ICEDTEA_ZERO_BUILD
-+LIBS_VM += $(LIBFFI_LIBS)
-+endif
-
- LINK_VM = $(LINK_LIB.c)
-
diff -r c18ada9920f7 patches/icedtea-zero-build.patch
--- a/patches/icedtea-zero-build.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-10-02 00:39:36.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk 2009-10-02 00:56:28.000000000 +0100
-@@ -99,8 +99,16 @@
- 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)
-+ ifeq ($(ZERO_ENDIANNESS), little)
-+ CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
-+ endif
-+ 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 -Nru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk/corba/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2009-10-02 00:39:36.000000000 +0100
-+++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2009-10-02 00:57:13.000000000 +0100
-@@ -70,6 +70,11 @@
- 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
-@@ -88,6 +93,7 @@
- endif
- endif
- endif
-+ endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
- SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
-diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
---- openjdk.orig/corba/make/common/shared/Platform.gmk 2009-05-14 10:27:42.000000000 +0100
-+++ openjdk/corba/make/common/shared/Platform.gmk 2009-10-02 00:56:28.000000000 +0100
-@@ -202,6 +202,11 @@
- 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 -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2009-10-02 00:39:36.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2009-10-02 00:56:28.000000000 +0100
-@@ -98,7 +98,11 @@
- #define VMTYPE COMPILER1_PRESENT("Client") \
- COMPILER2_PRESENT("Server")
- #else
-+#ifdef ZERO
-+ #define VMTYPE "Zero"
-+#else
- #define VMTYPE "Core"
-+#endif // ZERO
- #endif // COMPILER1 || COMPILER2
- #endif // TIERED
- #endif // KERNEL
-@@ -146,10 +150,14 @@
- WINDOWS_ONLY("windows") \
- SOLARIS_ONLY("solaris")
-
-+#ifdef ZERO
-+#define CPU ZERO_LIBARCH
-+#else
- #define CPU IA32_ONLY("x86") \
- IA64_ONLY("ia64") \
- AMD64_ONLY("amd64") \
- SPARC_ONLY("sparc")
-+#endif // ZERO
-
- const char *Abstract_VM_Version::vm_platform_string() {
- return OS "-" CPU;
-diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-10-02 00:39:36.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2009-10-02 00:56:28.000000000 +0100
-@@ -109,8 +109,16 @@
- 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)
-+ ifeq ($(ZERO_ENDIANNESS), little)
-+ CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
-+ endif
-+ 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 -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-10-02 00:39:36.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-10-02 00:56:28.000000000 +0100
-@@ -70,6 +70,11 @@
- 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
-@@ -93,6 +98,7 @@
- endif
- endif
- endif
-+ endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
- SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
-diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2009-10-01 18:31:51.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Platform.gmk 2009-10-02 00:56:28.000000000 +0100
-@@ -212,6 +212,11 @@
- 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 -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
---- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2009-10-01 18:31:54.000000000 +0100
-+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2009-10-02 00:56:28.000000000 +0100
-@@ -55,21 +55,25 @@
-
- endif # PLATFORM solaris
-
--ifeq ($(ARCH), i586)
-- CPPFLAGS += -DX_ARCH=X_I586
--endif # ARCH i586
--
--ifeq ($(ARCH), sparc)
-- CPPFLAGS += -DX_ARCH=X_SPARC
--endif # ARCH sparc
--
--ifeq ($(ARCH), sparcv9)
-- CPPFLAGS += -DX_ARCH=X_SPARCV9
--endif # ARCH sparcv9
--
--ifeq ($(ARCH), amd64)
-- CPPFLAGS += -DX_ARCH=X_AMD64
--endif # ARCH amd64
-+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), sparcv9)
-+ CPPFLAGS += -DX_ARCH=X_SPARCV9
-+ endif # ARCH sparcv9
-+
-+ ifeq ($(ARCH), amd64)
-+ CPPFLAGS += -DX_ARCH=X_AMD64
-+ endif # ARCH amd64
-+endif
-
-
- # files needed for MIDI i/o
-diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
---- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-10-01 18:36:51.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-10-02 00:56:28.000000000 +0100
-@@ -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 c18ada9920f7 patches/icedtea-zero.patch
--- a/patches/icedtea-zero.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2008-07-27 08:37:02.000000000 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-07-27 08:43:41.000000000 +0000
-@@ -159,7 +159,9 @@
- #endif
-
- // Cpu architecture string
--#if defined(IA64)
-+#if defined(ZERO)
-+static char cpu_arch[] = ZERO_LIBARCH;
-+#elif defined(IA64)
- static char cpu_arch[] = "ia64";
- #elif defined(IA32)
- static char cpu_arch[] = "i386";
-@@ -1665,7 +1667,14 @@
- {EM_SPARC32PLUS, EM_SPARC, ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
- {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
- {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
-- {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}
-+ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
-+ {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
-+ {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
-+ {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
-+ {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
-+ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
-+ {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
-+ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
- };
-
- #if (defined IA32)
-@@ -1682,9 +1691,23 @@
- static Elf32_Half running_arch_code=EM_PPC64;
- #elif (defined __powerpc__)
- static Elf32_Half running_arch_code=EM_PPC;
-+ #elif (defined ARM)
-+ static Elf32_Half running_arch_code=EM_ARM;
-+ #elif (defined S390)
-+ static Elf32_Half running_arch_code=EM_S390;
-+ #elif (defined ALPHA)
-+ static Elf32_Half running_arch_code=EM_ALPHA;
-+ #elif (defined MIPSEL)
-+ static Elf32_Half running_arch_code=EM_MIPS_RS3_LE;
-+ #elif (defined PARISC)
-+ static Elf32_Half running_arch_code=EM_PARISC;
-+ #elif (defined MIPS)
-+ static Elf32_Half running_arch_code=EM_MIPS;
-+ #elif (defined M68K)
-+ static Elf32_Half running_arch_code=EM_68K;
- #else
- #error Method os::dll_load requires that one of following is defined:\
-- IA32, AMD64, IA64, __sparc, __powerpc__
-+ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
- #endif
-
- // Identify compatability class for VM's architecture and library's architecture
-@@ -1716,10 +1739,12 @@
- return NULL;
- }
-
-+#ifndef S390
- if (lib_arch.elf_class != arch_array[running_arch_index].elf_class) {
- ::snprintf(diag_msg_buf, diag_msg_max_length-1," (Possible cause: architecture word width mismatch)");
- return NULL;
- }
-+#endif // !S390
-
- if (lib_arch.compat_class != arch_array[running_arch_index].compat_class) {
- if ( lib_arch.name!=NULL ) {
-@@ -2354,7 +2379,9 @@
- // format has been changed), we'll use the largest page size supported by
- // the processor.
-
-+#ifndef ZERO
- _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M);
-+#endif
-
- FILE *fp = fopen("/proc/meminfo", "r");
- if (fp) {
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig 2008-07-27 08:37:03.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2008-07-27 08:38:13.000000000 +0000
-@@ -424,7 +421,9 @@
- #ifdef ASSERT
- if (istate->_msg != initialize) {
- assert(abs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + 1), "bad stack limit");
-- IA32_ONLY(assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1, "wrong"));
-+#if defined(IA32) && !defined(ZERO)
-+ assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1, "wrong");
-+#endif // IA32 && !ZERO
- }
- // Verify linkages.
- interpreterState l = istate;
-@@ -3030,9 +3030,9 @@
- tty->print_cr("&native_fresult: " INTPTR_FORMAT, (uintptr_t) &this->_native_fresult);
- tty->print_cr("native_lresult: " INTPTR_FORMAT, (uintptr_t) this->_native_lresult);
- #endif
--#ifdef IA64
-+#if defined(IA64) && !defined(ZERO)
- tty->print_cr("last_Java_fp: " INTPTR_FORMAT, (uintptr_t) this->_last_Java_fp);
--#endif // IA64
-+#endif // IA64 && !ZERO
- tty->print_cr("self_link: " INTPTR_FORMAT, (uintptr_t) this->_self_link);
- }
-
---- openjdk/hotspot/src/share/vm/runtime/mutex.hpp.orig 2008-07-27 08:37:02.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp 2008-07-27 08:38:13.000000000 +0000
-@@ -61,18 +61,10 @@
- } ;
-
- // Endian-ness ... index of least-significant byte in SplitWord.Bytes[]
--#ifdef AMD64 // little
-+#ifdef VM_LITTLE_ENDIAN
- #define _LSBINDEX 0
- #else
--#if IA32 // little
-- #define _LSBINDEX 0
--#else
--#ifdef SPARC // big
- #define _LSBINDEX (sizeof(intptr_t)-1)
--#else
-- #error "unknown architecture"
--#endif
--#endif
- #endif
-
- class ParkEvent ;
---- openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp.orig 2008-07-27 08:37:02.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp 2008-07-27 08:38:13.000000000 +0000
-@@ -126,9 +126,17 @@
- // Fill block with bad_handle values
- void zap();
-
-+#ifdef ZERO
-+ protected:
-+ friend class CppInterpreter;
-+#endif // ZERO
-+
- // No more handles in the both the current and following blocks
- void clear() { _top = 0; }
-
-+#ifdef ZERO
-+ private:
-+#endif // ZERO
- // Free list computation
- void rebuild_free_list();
-
---- openjdk/hotspot/src/share/vm/utilities/vmError.cpp.orig 2008-07-27 08:37:02.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-07-27 08:38:13.000000000 +0000
-@@ -462,6 +462,40 @@
-
- if (_verbose && _thread && _thread->is_Java_thread()) {
- JavaThread* jt = (JavaThread*)_thread;
-+#ifdef ZERO
-+ if (jt->zero_stack()->sp() && jt->top_zero_frame()) {
-+ // StackFrameStream uses the frame anchor, which may not have
-+ // been set up. This can be done at any time in Zero, however,
-+ // so if it hasn't been set up then we just set it up now and
-+ // clear it again when we're done.
-+ bool has_last_Java_frame = jt->has_last_Java_frame();
-+ if (!has_last_Java_frame)
-+ jt->set_last_Java_frame();
-+ st->print("Java frames:");
-+
-+ // If the top frame is a Shark frame and the frame anchor isn't
-+ // set up then it's possible that the information in the frame
-+ // is garbage: it could be from a previous decache, or it could
-+ // simply have never been written. So we print a warning...
-+ StackFrameStream sfs(jt);
-+ if (!has_last_Java_frame && !sfs.is_done()) {
-+ if (sfs.current()->zeroframe()->is_shark_frame()) {
-+ st->print(" (TOP FRAME MAY BE JUNK)");
-+ }
-+ }
-+ st->cr();
-+
-+ // Print the frames
-+ for(int i = 0; !sfs.is_done(); sfs.next(), i++) {
-+ sfs.current()->zero_print_on_error(i, st, buf, sizeof(buf));
-+ st->cr();
-+ }
-+
-+ // Reset the frame anchor if necessary
-+ if (!has_last_Java_frame)
-+ jt->reset_last_Java_frame();
-+ }
-+#else
- if (jt->has_last_Java_frame()) {
- st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
- for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
-@@ -469,6 +503,7 @@
- st->cr();
- }
- }
-+#endif // ZERO
- }
-
- STEP(140, "(printing VM operation)" )
-
-Index: openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp
-===================================================================
---- openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp.orig 2009-06-10 11:30:46.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp 2009-06-10 11:37:07.000000000 +0200
-@@ -173,7 +173,11 @@
- // is not permitted.
- return (thr->has_last_Java_frame() &&
- (void*)obj < (void*)thr->stack_base() &&
-+#ifdef ZERO
-+ (void*)obj >= (void*)os::current_stack_pointer());
-+#else
- (void*)obj >= (void*)thr->last_Java_sp());
-+#endif // ZERO
- }
-
-
---- openjdk/hotspot/src/share/vm/includeDB_core 2009-09-08 13:22:25.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/includeDB_core 2009-09-08 13:41:57.000000000 +0100
-@@ -1655,12 +1655,14 @@
- frame_<arch>.cpp frame.inline.hpp
- frame_<arch>.cpp handles.inline.hpp
- frame_<arch>.cpp interpreter.hpp
-+frame_<arch>.cpp interpreterRuntime.hpp
- frame_<arch>.cpp javaCalls.hpp
- frame_<arch>.cpp markOop.hpp
- frame_<arch>.cpp methodOop.hpp
- frame_<arch>.cpp monitorChunk.hpp
- frame_<arch>.cpp oop.inline.hpp
- frame_<arch>.cpp resourceArea.hpp
-+frame_<arch>.cpp scopeDesc.hpp
- frame_<arch>.cpp signature.hpp
- frame_<arch>.cpp stubCodeGenerator.hpp
- frame_<arch>.cpp stubRoutines.hpp
diff -r c18ada9920f7 patches/zero/6890308.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6890308.patch Tue Dec 08 09:36:55 2009 +0000
@@ -0,0 +1,760 @@
+diff -r 03b336640699 -r 354d3184f6b2 make/Makefile
+--- openjdk/hotspot/make/Makefile Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/Makefile Tue Oct 13 12:04:21 2009 -0700
+@@ -84,6 +84,7 @@
+ C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
+ C2_VM_TARGETS=product fastdebug optimized jvmg
+ KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
++ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
+
+ # JDK directory list
+ JDK_DIRS=bin include jre lib demo
+@@ -94,6 +95,12 @@
+ all_debug: jvmg jvmg1 jvmgkernel docs export_debug
+ all_optimized: optimized optimized1 optimizedkernel docs export_optimized
+
++allzero: all_productzero all_fastdebugzero
++all_productzero: productzero docs export_product
++all_fastdebugzero: fastdebugzero docs export_fastdebug
++all_debugzero: jvmgzero docs export_debug
++all_optimizedzero: optimizedzero docs export_optimized
++
+ # Do everything
+ world: all create_jdk
+
+@@ -120,6 +127,10 @@
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
+
++$(ZERO_VM_TARGETS):
++ $(CD) $(GAMMADIR)/make; \
++ $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
++
+ # Build compiler1 (client) rule, different for platforms
+ generic_build1:
+ $(MKDIR) -p $(OUTPUTDIR)
+@@ -180,6 +191,12 @@
+ @$(ECHO) "No kernel ($(VM_TARGET)) for OS_NAME=$(OSNAME)"
+ endif
+
++generic_buildzero:
++ $(MKDIR) -p $(OUTPUTDIR)
++ $(CD) $(OUTPUTDIR); \
++ $(MAKE) -f $(ABS_OS_MAKEFILE) \
++ $(MAKE_ARGS) $(VM_TARGET)
++
+ # Export file rule
+ generic_export: $(EXPORT_LIST)
+ export_product:
+@@ -210,11 +227,17 @@
+ C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
+ C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
+ KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
++ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
+ C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
+ C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
+ KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
++ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
+
+ # Misc files and generated files need to come from C1 or C2 area
++ifeq ($(ZERO_BUILD), true)
++ MISC_DIR=$(ZERO_DIR)
++ GEN_DIR=$(ZERO_BASE_DIR)/generated
++else
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ MISC_DIR=$(C1_DIR)
+ GEN_DIR=$(C1_BASE_DIR)/generated
+@@ -222,6 +245,7 @@
+ MISC_DIR=$(C2_DIR)
+ GEN_DIR=$(C2_BASE_DIR)/generated
+ endif
++endif
+
+ # Bin files (windows)
+ ifeq ($(OSNAME),windows)
+@@ -265,6 +289,12 @@
+
+ # Shared Library
+ ifneq ($(OSNAME),windows)
++ ifeq ($(ZERO_BUILD), true)
++$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
++ $(install-file)
++$(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so
++ $(install-file)
++ else
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+ $(install-file)
+ $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so
+@@ -275,6 +305,7 @@
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so
+ $(install-file)
++ endif
+ endif
+
+ # Jar file (sa-jdi.jar)
+@@ -313,6 +344,7 @@
+ $(RM) -r $(C1_DIR)
+ $(RM) -r $(C2_DIR)
+ $(RM) -r $(KERNEL_DIR)
++ $(RM) -r $(ZERO_DIR)
+ clean_export:
+ $(RM) -r $(EXPORT_PATH)
+ clean_jdk:
+@@ -335,8 +367,10 @@
+ ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
+
+ test_jdk:
+- ifeq ($(ARCH_DATA_MODEL), 32)
++ ifneq ($(ZERO_BUILD), true)
++ ifeq ($(ARCH_DATA_MODEL), 32)
+ $(JDK_IMAGE_DIR)/bin/java -client -version
++ endif
+ endif
+ $(JDK_IMAGE_DIR)/bin/java -server -version
+
+diff -r 03b336640699 -r 354d3184f6b2 make/defs.make
+--- openjdk/hotspot/make/defs.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/defs.make Tue Oct 13 12:04:21 2009 -0700
+@@ -192,13 +192,14 @@
+
+ # Use uname output for SRCARCH, but deal with platform differences. If ARCH
+ # is not explicitly listed below, it is treated as x86.
+- SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64,$(ARCH)))
++ SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH)))
+ ARCH/ = x86
+ ARCH/sparc = sparc
+ ARCH/sparc64= sparc
+ ARCH/ia64 = ia64
+ ARCH/amd64 = x86
+ ARCH/x86_64 = x86
++ ARCH/zero = zero
+
+ # BUILDARCH is usually the same as SRCARCH, except for sparcv9
+ BUILDARCH = $(SRCARCH)
+@@ -222,8 +223,9 @@
+ LIBARCH/sparc = sparc
+ LIBARCH/sparcv9 = sparcv9
+ LIBARCH/ia64 = ia64
++ LIBARCH/zero = $(ZERO_LIBARCH)
+
+- LP64_ARCH = sparcv9 amd64 ia64
++ LP64_ARCH = sparcv9 amd64 ia64 zero
+ endif
+
+ # Required make macro settings for all platforms
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/Makefile
+--- openjdk/hotspot/make/linux/Makefile Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/Makefile Tue Oct 13 12:04:21 2009 -0700
+@@ -132,6 +132,9 @@
+
+ endif
+
++# BUILDARCH is set to "zero" for Zero builds. VARIANTARCH
++# is used to give the build directories meaningful names.
++VARIANTARCH = $(subst i386,i486,$(ZERO_LIBARCH))
+
+ # There is a (semi-) regular correspondence between make targets and actions:
+ #
+@@ -158,6 +161,13 @@
+ # profiledcore core <os>_<arch>_core/profiled
+ # productcore core <os>_<arch>_core/product
+ #
++# debugzero zero <os>_<arch>_zero/debug
++# fastdebugzero zero <os>_<arch>_zero/fastdebug
++# jvmgzero zero <os>_<arch>_zero/jvmg
++# optimizedzero zero <os>_<arch>_zero/optimized
++# profiledzero zero <os>_<arch>_zero/profiled
++# productzero zero <os>_<arch>_zero/product
++#
+ # What you get with each target:
+ #
+ # debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
+@@ -171,16 +181,22 @@
+ # in the build.sh script:
+ TARGETS = debug jvmg fastdebug optimized profiled product
+
+-SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
++ifeq ($(ZERO_BUILD), true)
++ SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs
++else
++ SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
++endif
+ SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
+ SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
+ SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
+ SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
++SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
+
+ TARGETS_C2 = $(TARGETS)
+ TARGETS_C1 = $(addsuffix 1,$(TARGETS))
+ TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
+ TARGETS_CORE = $(addsuffix core,$(TARGETS))
++TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
+
+ BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
+ BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
+@@ -196,6 +212,7 @@
+ @echo " $(TARGETS_C2)"
+ @echo " $(TARGETS_C1)"
+ @echo " $(TARGETS_CORE)"
++ @echo " $(TARGETS_ZERO)"
+
+ checks: check_os_version check_j2se_version
+
+@@ -245,6 +262,13 @@
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=core
+
++$(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero
++ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
++ $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
++
++platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
++ $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
++
+ # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+@@ -275,10 +299,18 @@
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
++$(TARGETS_ZERO): $(SUBDIRS_ZERO)
++ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
++ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
++ifdef INSTALL
++ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
++endif
++
+ # Just build the tree, and nothing else:
+ tree: $(SUBDIRS_C2)
+ tree1: $(SUBDIRS_C1)
+ treecore: $(SUBDIRS_CORE)
++treezero: $(SUBDIRS_ZERO)
+
+ # Doc target. This is the same for all build options.
+ # Hence create a docs directory beside ...$(ARCH)_[...]
+@@ -293,20 +325,22 @@
+
+ core: jvmgcore productcore
+
++zero: jvmgzero productzero
++
+ clean_docs:
+ rm -rf $(SUBDIR_DOCS)
+
+-clean_compiler1 clean_compiler2 clean_core:
++clean_compiler1 clean_compiler2 clean_core clean_zero:
+ rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
+
+-clean: clean_compiler2 clean_compiler1 clean_core clean_docs
++clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs
+
+ include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
+
+ #-------------------------------------------------------------------------------
+
+-.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE)
+-.PHONY: tree tree1 treecore
+-.PHONY: all compiler1 compiler2 core
+-.PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs
++.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
++.PHONY: tree tree1 treecore treezero
++.PHONY: all compiler1 compiler2 core zero
++.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
+ .PHONY: checks check_os_version check_j2se_version
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/makefiles/buildtree.make
+--- openjdk/hotspot/make/linux/makefiles/buildtree.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/makefiles/buildtree.make Tue Oct 13 12:04:21 2009 -0700
+@@ -63,20 +63,30 @@
+ # For now, until the compiler is less wobbly:
+ TESTFLAGS = -Xbatch -showversion
+
+-ifdef USE_SUNCC
+-PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
++ifeq ($(ZERO_BUILD), true)
++ PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
+ else
+-PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
++ ifdef USE_SUNCC
++ PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
++ else
++ PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
++ endif
++endif
++
++# Allow overriding of the arch part of the directory but default
++# to BUILDARCH if nothing is specified
++ifeq ($(VARIANTARCH),)
++ VARIANTARCH=$(BUILDARCH)
+ endif
+
+ ifdef FORCE_TIERED
+ ifeq ($(VARIANT),tiered)
+-PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_compiler2
++PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_compiler2
+ else
+-PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT)
++PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
+ endif
+ else
+-PLATFORM_DIR = $(OS_FAMILY)_$(BUILDARCH)_$(VARIANT)
++PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
+ endif
+
+ #
+@@ -321,6 +331,7 @@
+ DATA_MODE/sparcv9 = 64
+ DATA_MODE/amd64 = 64
+ DATA_MODE/ia64 = 64
++DATA_MODE/zero = $(ARCH_DATA_MODEL)
+
+ JAVA_FLAG/32 = -d32
+ JAVA_FLAG/64 = -d64
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/makefiles/defs.make
+--- openjdk/hotspot/make/linux/makefiles/defs.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/makefiles/defs.make Tue Oct 13 12:04:21 2009 -0700
+@@ -37,6 +37,17 @@
+ ARCH_DATA_MODEL ?= 32
+ endif
+
++# zero
++ifeq ($(ZERO_BUILD), true)
++ ifeq ($(ARCH_DATA_MODEL), 64)
++ MAKE_ARGS += LP64=1
++ endif
++ PLATFORM = linux-zero
++ VM_PLATFORM = linux_$(subst i386,i486,$(ZERO_LIBARCH))
++ HS_ARCH = zero
++ ARCH = zero
++endif
++
+ # ia64
+ ifeq ($(ARCH), ia64)
+ ARCH_DATA_MODEL = 64
+@@ -97,17 +108,19 @@
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+-ifeq ($(ARCH_DATA_MODEL), 32)
+- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
+- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
+- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+-else
+- ifeq ($(ARCH),ia64)
+- else
+- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
++ifneq ($(ZERO_BUILD), true)
++ ifeq ($(ARCH_DATA_MODEL), 32)
++ EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
++ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
++ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
++ else
++ ifeq ($(ARCH),ia64)
++ else
++ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
++ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+ endif
++ endif
+ endif
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/makefiles/gcc.make
+--- openjdk/hotspot/make/linux/makefiles/gcc.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/makefiles/gcc.make Tue Oct 13 12:04:21 2009 -0700
+@@ -52,6 +52,9 @@
+ VM_PICFLAG/AOUT =
+ VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
+
++ifeq ($(ZERO_BUILD), true)
++CFLAGS += $(LIBFFI_CFLAGS)
++endif
+ CFLAGS += $(VM_PICFLAG)
+ CFLAGS += -fno-rtti
+ CFLAGS += -fno-exceptions
+@@ -64,6 +67,7 @@
+ ARCHFLAG/ia64 =
+ ARCHFLAG/sparc = -m32 -mcpu=v9
+ ARCHFLAG/sparcv9 = -m64 -mcpu=v9
++ARCHFLAG/zero = $(ZERO_ARCHFLAG)
+
+ CFLAGS += $(ARCHFLAG)
+ AOUT_FLAGS += $(ARCHFLAG)
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/makefiles/sa.make
+--- openjdk/hotspot/make/linux/makefiles/sa.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/makefiles/sa.make Tue Oct 13 12:04:21 2009 -0700
+@@ -52,10 +52,10 @@
+ SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
+
+ # if $(AGENT_DIR) does not exist, we don't build SA
+-# also, we don't build SA on Itanium.
++# also, we don't build SA on Itanium or zero.
+
+ all:
+- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
++ if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
+ $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
+ fi
+
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/makefiles/saproc.make
+--- openjdk/hotspot/make/linux/makefiles/saproc.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/makefiles/saproc.make Tue Oct 13 12:04:21 2009 -0700
+@@ -49,10 +49,10 @@
+ endif
+
+ # if $(AGENT_DIR) does not exist, we don't build SA
+-# also, we don't build SA on Itanium.
++# also, we don't build SA on Itanium or zero.
+
+ checkAndBuildSA:
+- $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
++ $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
+ $(MAKE) -f vm.make $(LIBSAPROC); \
+ fi
+
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/makefiles/top.make
+--- openjdk/hotspot/make/linux/makefiles/top.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/makefiles/top.make Tue Oct 13 12:04:21 2009 -0700
+@@ -74,6 +74,7 @@
+ Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
+ Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
+ Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
++Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero
+ Include_DBs = $(Include_DBs/$(TYPE))
+
+ Cached_plat = $(GENERATED)/platform.current
+diff -r 03b336640699 -r 354d3184f6b2 make/linux/makefiles/vm.make
+--- openjdk/hotspot/make/linux/makefiles/vm.make Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/make/linux/makefiles/vm.make Tue Oct 13 12:04:21 2009 -0700
+@@ -40,7 +40,11 @@
+ include $(GENERATED)/Dependencies
+
+ # read machine-specific adjustments (%%% should do this via buildtree.make?)
+-include $(MAKEFILES_DIR)/$(BUILDARCH).make
++ifeq ($(ZERO_BUILD), true)
++ include $(MAKEFILES_DIR)/zeroshark.make
++else
++ include $(MAKEFILES_DIR)/$(BUILDARCH).make
++endif
+
+ # set VPATH so make knows where to look for source files
+ # Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
+@@ -124,7 +128,11 @@
+ rm -f $@
+ cat $^ > $@
+
+-STATIC_CXX = true
++ifeq ($(ZERO_LIBARCH), ppc64)
++ STATIC_CXX = false
++else
++ STATIC_CXX = true
++endif
+
+ ifeq ($(LINK_INTO),AOUT)
+ LIBJVM.o =
+@@ -148,6 +156,9 @@
+
+ LIBS_VM += $(LIBS)
+ endif
++ifeq ($(ZERO_BUILD), true)
++ LIBS_VM += $(LIBFFI_LIBS)
++endif
+
+ LINK_VM = $(LINK_LIB.c)
+
+diff -r 03b336640699 -r 354d3184f6b2 src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Oct 13 12:04:21 2009 -0700
+@@ -176,7 +176,9 @@
+ #endif
+
+ // Cpu architecture string
+-#if defined(IA64)
++#if defined(ZERO)
++static char cpu_arch[] = ZERO_LIBARCH;
++#elif defined(IA64)
+ static char cpu_arch[] = "ia64";
+ #elif defined(IA32)
+ static char cpu_arch[] = "i386";
+@@ -1743,7 +1745,14 @@
+ {EM_SPARC32PLUS, EM_SPARC, ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
+ {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
+ {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
+- {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}
++ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
++ {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
++ {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
++ {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
++ {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
++ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
++ {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
++ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
+ };
+
+ #if (defined IA32)
+@@ -1760,9 +1769,23 @@
+ static Elf32_Half running_arch_code=EM_PPC64;
+ #elif (defined __powerpc__)
+ static Elf32_Half running_arch_code=EM_PPC;
++ #elif (defined ARM)
++ static Elf32_Half running_arch_code=EM_ARM;
++ #elif (defined S390)
++ static Elf32_Half running_arch_code=EM_S390;
++ #elif (defined ALPHA)
++ static Elf32_Half running_arch_code=EM_ALPHA;
++ #elif (defined MIPSEL)
++ static Elf32_Half running_arch_code=EM_MIPS_RS3_LE;
++ #elif (defined PARISC)
++ static Elf32_Half running_arch_code=EM_PARISC;
++ #elif (defined MIPS)
++ static Elf32_Half running_arch_code=EM_MIPS;
++ #elif (defined M68K)
++ static Elf32_Half running_arch_code=EM_68K;
+ #else
+ #error Method os::dll_load requires that one of following is defined:\
+- IA32, AMD64, IA64, __sparc, __powerpc__
++ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
+ #endif
+
+ // Identify compatability class for VM's architecture and library's architecture
+@@ -1794,10 +1817,12 @@
+ return NULL;
+ }
+
++#ifndef S390
+ if (lib_arch.elf_class != arch_array[running_arch_index].elf_class) {
+ ::snprintf(diag_msg_buf, diag_msg_max_length-1," (Possible cause: architecture word width mismatch)");
+ return NULL;
+ }
++#endif // !S390
+
+ if (lib_arch.compat_class != arch_array[running_arch_index].compat_class) {
+ if ( lib_arch.name!=NULL ) {
+@@ -2586,7 +2611,9 @@
+ // format has been changed), we'll use the largest page size supported by
+ // the processor.
+
++#ifndef ZERO
+ _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M);
++#endif // ZERO
+
+ FILE *fp = fopen("/proc/meminfo", "r");
+ if (fp) {
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue Oct 13 12:04:21 2009 -0700
+@@ -3031,9 +3031,9 @@
+ tty->print_cr("&native_fresult: " INTPTR_FORMAT, (uintptr_t) &this->_native_fresult);
+ tty->print_cr("native_lresult: " INTPTR_FORMAT, (uintptr_t) this->_native_lresult);
+ #endif
+-#ifdef IA64
++#if defined(IA64) && !defined(ZERO)
+ tty->print_cr("last_Java_fp: " INTPTR_FORMAT, (uintptr_t) this->_last_Java_fp);
+-#endif // IA64
++#endif // IA64 && !ZERO
+ tty->print_cr("self_link: " INTPTR_FORMAT, (uintptr_t) this->_self_link);
+ }
+
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/interpreter/oopMapCache.cpp
+--- openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp Tue Oct 13 12:04:21 2009 -0700
+@@ -281,7 +281,7 @@
+ public:
+ void pass_int() { /* ignore */ }
+ void pass_long() { /* ignore */ }
+-#ifdef _LP64
++#if defined(_LP64) || defined(ZERO)
+ void pass_float() { /* ignore */ }
+ #endif
+ void pass_double() { /* ignore */ }
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Tue Oct 13 12:04:21 2009 -0700
+@@ -1229,6 +1229,7 @@
+ }
+ }
+
++#ifndef ZERO
+ #ifdef _LP64
+ // Check that UseCompressedOops can be set with the max heap size allocated
+ // by ergonomics.
+@@ -1254,6 +1255,7 @@
+ // Also checks that certain machines are slower with compressed oops
+ // in vm_version initialization code.
+ #endif // _LP64
++#endif // !ZERO
+ }
+
+ void Arguments::set_parallel_gc_flags() {
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/runtime/jniHandles.hpp
+--- openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp Tue Oct 13 12:04:21 2009 -0700
+@@ -99,6 +99,8 @@
+
+ class JNIHandleBlock : public CHeapObj {
+ friend class VMStructs;
++ friend class CppInterpreter;
++
+ private:
+ enum SomeConstants {
+ block_size_in_oops = 32 // Number of handles per handle block
+@@ -126,9 +128,11 @@
+ // Fill block with bad_handle values
+ void zap();
+
++ protected:
+ // No more handles in the both the current and following blocks
+ void clear() { _top = 0; }
+
++ private:
+ // Free list computation
+ void rebuild_free_list();
+
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/runtime/mutex.hpp
+--- openjdk/hotspot/src/share/vm/runtime/mutex.hpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp Tue Oct 13 12:04:21 2009 -0700
+@@ -61,18 +61,10 @@
+ } ;
+
+ // Endian-ness ... index of least-significant byte in SplitWord.Bytes[]
+-#ifdef AMD64 // little
++#ifdef VM_LITTLE_ENDIAN
+ #define _LSBINDEX 0
+ #else
+-#if IA32 // little
+- #define _LSBINDEX 0
+-#else
+-#ifdef SPARC // big
+ #define _LSBINDEX (sizeof(intptr_t)-1)
+-#else
+- #error "unknown architecture"
+-#endif
+-#endif
+ #endif
+
+ class ParkEvent ;
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/runtime/signature.hpp
+--- openjdk/hotspot/src/share/vm/runtime/signature.hpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/runtime/signature.hpp Tue Oct 13 12:04:21 2009 -0700
+@@ -275,11 +275,14 @@
+
+ void do_bool () { pass_int(); _jni_offset++; _offset++; }
+ void do_char () { pass_int(); _jni_offset++; _offset++; }
++#if defined(_LP64) || defined(ZERO)
++ void do_float () { pass_float(); _jni_offset++; _offset++; }
++#else
++ void do_float () { pass_int(); _jni_offset++; _offset++; }
++#endif
+ #ifdef _LP64
+- void do_float () { pass_float(); _jni_offset++; _offset++; }
+ void do_double() { pass_double(); _jni_offset++; _offset += 2; }
+ #else
+- void do_float () { pass_int(); _jni_offset++; _offset++; }
+ void do_double() { pass_double(); _jni_offset += 2; _offset += 2; }
+ #endif
+ void do_byte () { pass_int(); _jni_offset++; _offset++; }
+@@ -303,8 +306,10 @@
+ virtual void pass_int() = 0;
+ virtual void pass_long() = 0;
+ virtual void pass_object() = 0;
++#if defined(_LP64) || defined(ZERO)
++ virtual void pass_float() = 0;
++#endif
+ #ifdef _LP64
+- virtual void pass_float() = 0;
+ virtual void pass_double() = 0;
+ #else
+ virtual void pass_double() { pass_long(); } // may be same as long
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Tue Oct 13 12:04:21 2009 -0700
+@@ -93,9 +93,13 @@
+ #else // KERNEL
+ #ifdef TIERED
+ #define VMTYPE "Server"
+-#else
+- #define VMTYPE COMPILER1_PRESENT("Client") \
+- COMPILER2_PRESENT("Server")
++#else // TIERED
++#ifdef ZERO
++ #define VMTYPE "Zero"
++#else // ZERO
++ #define VMTYPE COMPILER1_PRESENT("Client") \
++ COMPILER2_PRESENT("Server")
++#endif // ZERO
+ #endif // TIERED
+ #endif // KERNEL
+
+@@ -142,10 +146,14 @@
+ WINDOWS_ONLY("windows") \
+ SOLARIS_ONLY("solaris")
+
++#ifdef ZERO
++#define CPU ZERO_LIBARCH
++#else
+ #define CPU IA32_ONLY("x86") \
+ IA64_ONLY("ia64") \
+ AMD64_ONLY("amd64") \
+ SPARC_ONLY("sparc")
++#endif // ZERO
+
+ const char *Abstract_VM_Version::vm_platform_string() {
+ return OS "-" CPU;
+diff -r 03b336640699 -r 354d3184f6b2 src/share/vm/utilities/vmError.cpp
+--- openjdk/hotspot/src/share/vm/utilities/vmError.cpp Wed Oct 07 15:38:37 2009 -0700
++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp Tue Oct 13 12:04:21 2009 -0700
+@@ -458,6 +458,40 @@
+
+ if (_verbose && _thread && _thread->is_Java_thread()) {
+ JavaThread* jt = (JavaThread*)_thread;
++#ifdef ZERO
++ if (jt->zero_stack()->sp() && jt->top_zero_frame()) {
++ // StackFrameStream uses the frame anchor, which may not have
++ // been set up. This can be done at any time in Zero, however,
++ // so if it hasn't been set up then we just set it up now and
++ // clear it again when we're done.
++ bool has_last_Java_frame = jt->has_last_Java_frame();
++ if (!has_last_Java_frame)
++ jt->set_last_Java_frame();
++ st->print("Java frames:");
++
++ // If the top frame is a Shark frame and the frame anchor isn't
++ // set up then it's possible that the information in the frame
++ // is garbage: it could be from a previous decache, or it could
++ // simply have never been written. So we print a warning...
++ StackFrameStream sfs(jt);
++ if (!has_last_Java_frame && !sfs.is_done()) {
++ if (sfs.current()->zeroframe()->is_shark_frame()) {
++ st->print(" (TOP FRAME MAY BE JUNK)");
++ }
++ }
++ st->cr();
++
++ // Print the frames
++ for(int i = 0; !sfs.is_done(); sfs.next(), i++) {
++ sfs.current()->zero_print_on_error(i, st, buf, sizeof(buf));
++ st->cr();
++ }
++
++ // Reset the frame anchor if necessary
++ if (!has_last_Java_frame)
++ jt->reset_last_Java_frame();
++ }
++#else
+ if (jt->has_last_Java_frame()) {
+ st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
+ for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
+@@ -465,6 +499,7 @@
+ st->cr();
+ }
+ }
++#endif // ZERO
+ }
+
+ STEP(140, "(printing VM operation)" )
diff -r c18ada9920f7 patches/zero/6891677.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6891677.patch Tue Dec 08 09:36:55 2009 +0000
@@ -0,0 +1,418 @@
+diff -r 2c88089b6e1c -r 608937d41381 make/hotspot-rules.gmk
+--- openjdk/make/hotspot-rules.gmk Fri Oct 02 11:26:17 2009 -0700
++++ openjdk/make/hotspot-rules.gmk Thu Oct 15 13:26:17 2009 +0100
+@@ -72,6 +72,10 @@
+ HOTSPOT_TARGET = all_fastdebug
+ endif
+
++ifeq ($(ZERO_BUILD), true)
++ HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
++endif
++
+ HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
+diff -r 5d0cf59a3203 -r 34a68fa0680b make/common/Defs-linux.gmk
+--- openjdk/corba/make/common/Defs-linux.gmk Fri Oct 02 11:26:18 2009 -0700
++++ openjdk/corba/make/common/Defs-linux.gmk Thu Oct 15 13:28:26 2009 +0100
+@@ -99,8 +99,16 @@
+ 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))
++ifeq ($(ZERO_BUILD), true)
++ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
++ ifeq ($(ZERO_ENDIANNESS), little)
++ CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
++ endif
++ 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))
+@@ -196,7 +204,7 @@
+
+ EXTRA_LIBS += -lc
+
+-LDFLAGS_DEFS_OPTION = -z defs
++LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
+ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
+
+ #
+diff -r 5d0cf59a3203 -r 34a68fa0680b make/common/shared/Compiler-gcc.gmk
+--- openjdk/corba/make/common/shared/Compiler-gcc.gmk Fri Oct 02 11:26:18 2009 -0700
++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk Thu Oct 15 13:28:26 2009 +0100
+@@ -70,6 +70,11 @@
+ else
+ CXX = $(COMPILER_PATH)g++
+ endif
++ ifeq ($(ZERO_BUILD), true)
++ # zero
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ else
+ ifneq ("$(findstring sparc,$(ARCH))", "")
+ # sparc or sparcv9
+ REQUIRED_CC_VER = 4.0
+@@ -88,6 +93,7 @@
+ endif
+ endif
+ endif
++ endif
+ # Option used to create a shared library
+ SHARED_LIBRARY_FLAG = -shared -mimpure-text
+ SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
+diff -r eacb36e30327 -r e2de121c27c4 make/common/Defs-linux.gmk
+--- openjdk/jdk/make/common/Defs-linux.gmk Wed Oct 14 23:41:11 2009 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk Thu Oct 15 13:27:59 2009 +0100
+@@ -116,8 +116,16 @@
+ 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))
++ifeq ($(ZERO_BUILD), true)
++ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
++ ifeq ($(ZERO_ENDIANNESS), little)
++ CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
++ endif
++ LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
++else
++ CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
++ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
++endif
+
+ # If this is a --hash-style=gnu system, use --hash-style=both
+ # The gnu .hash section won't work on some Linux systems like SuSE 10.
+@@ -217,7 +225,7 @@
+
+ EXTRA_LIBS += -lc
+
+-LDFLAGS_DEFS_OPTION = -z defs
++LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
+ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
+
+ #
+diff -r eacb36e30327 -r e2de121c27c4 make/common/Program.gmk
+--- openjdk/jdk/make/common/Program.gmk Wed Oct 14 23:41:11 2009 +0100
++++ openjdk/jdk/make/common/Program.gmk Thu Oct 15 13:27:59 2009 +0100
+@@ -85,7 +85,7 @@
+ endif
+ endif
+ ifeq ($(PLATFORM), linux)
+- LDFLAGS += -z origin
++ LDFLAGS += -Wl,-z -Wl,origin
+ LDFLAGS += -Wl,--allow-shlib-undefined
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
+@@ -279,8 +279,14 @@
+
+ #
+ # How to install jvm.cfg.
+-#
+-$(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(ARCH)/jvm.cfg
++#
++ifeq ($(ZERO_BUILD), true)
++JVMCFG_ARCH = zero
++else
++JVMCFG_ARCH = $(ARCH)
++endif
++
++$(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
+ $(install-file)
+
+ #
+diff -r eacb36e30327 -r e2de121c27c4 make/java/instrument/Makefile
+--- openjdk/jdk/make/java/instrument/Makefile Wed Oct 14 23:41:11 2009 +0100
++++ openjdk/jdk/make/java/instrument/Makefile Thu Oct 15 13:27:59 2009 +0100
+@@ -109,7 +109,7 @@
+ LDFLAGS += -R \$$ORIGIN/jli
+ endif
+ ifeq ($(PLATFORM), linux)
+- LDFLAGS += -z origin
++ LDFLAGS += -Wl,-z -Wl,origin
+ LDFLAGS += -Wl,--allow-shlib-undefined
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
+ endif
+diff -r eacb36e30327 -r e2de121c27c4 make/java/redist/Makefile
+--- openjdk/jdk/make/java/redist/Makefile Wed Oct 14 23:41:11 2009 +0100
++++ openjdk/jdk/make/java/redist/Makefile Thu Oct 15 13:27:59 2009 +0100
+@@ -94,11 +94,13 @@
+ endif
+ endif # INCLUDE_SA
+
+-# Hotspot client is only available on 32-bit builds
++# Hotspot client is only available on 32-bit non-Zero builds
++ifneq ($(ZERO_BUILD), true)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
+ endif
++endif
+
+ ifeq ($(PLATFORM), windows)
+ # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows
+@@ -171,6 +173,7 @@
+ IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
+ endif
+
++ifneq ($(ZERO_BUILD), true)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+
+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
+@@ -201,6 +204,8 @@
+
+ endif # 32bit
+
++endif # ZERO_BUILD
++
+ # NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
+
+ endif # PLATFORM
+diff -r eacb36e30327 -r e2de121c27c4 make/javax/sound/SoundDefs.gmk
+--- openjdk/jdk/make/javax/sound/SoundDefs.gmk Wed Oct 14 23:41:11 2009 +0100
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk Thu Oct 15 13:27:59 2009 +0100
+@@ -55,21 +55,25 @@
+
+ endif # PLATFORM solaris
+
+-ifeq ($(ARCH), i586)
+- CPPFLAGS += -DX_ARCH=X_I586
+-endif # ARCH i586
++ifeq ($(ZERO_BUILD), true)
++ 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 eacb36e30327 -r e2de121c27c4 make/jdk_generic_profile.sh
+--- openjdk/jdk/make/jdk_generic_profile.sh Wed Oct 14 23:41:11 2009 +0100
++++ openjdk/jdk/make/jdk_generic_profile.sh Thu Oct 15 13:27:59 2009 +0100
+@@ -339,3 +339,82 @@
+ PATH="${path4sdk}"
+ export PATH
+
++# Export variables required for Zero
++if [ "${ZERO_BUILD}" = true ] ; then
++ # ZERO_LIBARCH is the name of the architecture-specific
++ # subdirectory under $JAVA_HOME/jre/lib
++ arch=$(uname -m)
++ case "${arch}" in
++ x86_64) ZERO_LIBARCH=amd64 ;;
++ i?86) ZERO_LIBARCH=i386 ;;
++ sparc64) ZERO_LIBARCH=sparcv9 ;;
++ arm*) ZERO_LIBARCH=arm ;;
++ *) ZERO_LIBARCH="$(arch)"
++ esac
++ export ZERO_LIBARCH
++
++ # ARCH_DATA_MODEL is the number of bits in a pointer
++ case "${ZERO_LIBARCH}" in
++ i386|ppc|s390|sparc|arm)
++ ARCH_DATA_MODEL=32
++ ;;
++ amd64|ppc64|s390x|sparcv9|ia64|alpha)
++ ARCH_DATA_MODEL=64
++ ;;
++ *)
++ echo "ERROR: Unable to determine ARCH_DATA_MODEL for ${ZERO_LIBARCH}"
++ exit 1
++ esac
++ export ARCH_DATA_MODEL
++
++ # ZERO_ENDIANNESS is the endianness of the processor
++ case "${ZERO_LIBARCH}" in
++ i386|amd64|ia64)
++ ZERO_ENDIANNESS=little
++ ;;
++ ppc*|s390*|sparc*|alpha)
++ ZERO_ENDIANNESS=big
++ ;;
++ *)
++ echo "ERROR: Unable to determine ZERO_ENDIANNESS for ${ZERO_LIBARCH}"
++ exit 1
++ esac
++ export ZERO_ENDIANNESS
++
++ # ZERO_ARCHDEF is used to enable architecture-specific code
++ case "${ZERO_LIBARCH}" in
++ i386) ZERO_ARCHDEF=IA32 ;;
++ ppc*) ZERO_ARCHDEF=PPC ;;
++ s390*) ZERO_ARCHDEF=S390 ;;
++ sparc*) ZERO_ARCHDEF=SPARC ;;
++ *) ZERO_ARCHDEF=$(echo "${ZERO_LIBARCH}" | tr a-z A-Z)
++ esac
++ export ZERO_ARCHDEF
++
++ # ZERO_ARCHFLAG tells the compiler which mode to build for
++ case "${ZERO_LIBARCH}" in
++ s390)
++ ZERO_ARCHFLAG="-m31"
++ ;;
++ *)
++ ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
++ esac
++ export ZERO_ARCHFLAG
++
++ # LIBFFI_CFLAGS and LIBFFI_LIBS tell the compiler how to compile and
++ # link against libffi
++ pkgconfig=$(which pkg-config 2>/dev/null)
++ if [ -x "${pkgconfig}" ] ; then
++ if [ "${LIBFFI_CFLAGS}" = "" ] ; then
++ LIBFFI_CFLAGS=$("${pkgconfig}" --cflags libffi)
++ fi
++ if [ "${LIBFFI_LIBS}" = "" ] ; then
++ LIBFFI_LIBS=$("${pkgconfig}" --libs libffi)
++ fi
++ fi
++ if [ "${LIBFFI_LIBS}" = "" ] ; then
++ LIBFFI_LIBS="-lffi"
++ fi
++ export LIBFFI_CFLAGS
++ export LIBFFI_LIBS
++fi
+diff -r eacb36e30327 -r e2de121c27c4 src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Wed Oct 14 23:41:11 2009 +0100
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Thu Oct 15 13:27:59 2009 +0100
+@@ -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 eacb36e30327 -r e2de121c27c4 src/solaris/bin/ergo_zero.c
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/src/solaris/bin/ergo_zero.c Thu Oct 15 13:27:59 2009 +0100
+@@ -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 eacb36e30327 -r e2de121c27c4 src/solaris/bin/zero/jvm.cfg
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/src/solaris/bin/zero/jvm.cfg Thu Oct 15 13:27:59 2009 +0100
+@@ -0,0 +1,39 @@
++# Copyright 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.
++#
++-server KNOWN
++-client IGNORE
++-hotspot ERROR
++-classic WARN
++-native ERROR
++-green ERROR
diff -r c18ada9920f7 platform_zero.in
--- a/platform_zero.in Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-os_family = linux
-
-arch = zero
-
-arch_model = zero
-
-os_arch = linux_zero
-
-os_arch_model = linux_zero
-
-lib_arch = zero
-
-compiler = gcc
-
-gnu_dis_arch = zero
-
-sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D at ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
diff -r c18ada9920f7 ports/hotspot/build/linux/makefiles/shark.make
--- a/ports/hotspot/build/linux/makefiles/shark.make Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
-# 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.
-#
-# 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.
-#
-#
-
-# Sets make macros for making shark version of VM
-
-TYPE = SHARK
-
-VM_SUBDIR = server
-
-CFLAGS += -DSHARK
diff -r c18ada9920f7 ports/hotspot/build/linux/makefiles/zero.make
--- a/ports/hotspot/build/linux/makefiles/zero.make Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#
-# Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
-# Copyright 2007, 2008 Red Hat, Inc.
-# 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.
-#
-# 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.
-#
-#
-
-ifeq ($(ZERO_LIBARCH),arm)
-
-Obj_Files += asm_helper.o
-Obj_Files += cppInterpreter_arm.o
-
-CFLAGS += -DHOTSPOT_ASM
-
-%.o: %.S
- @echo Assembling $<
- $(QUIETLY) $(REMOVE_TARGET)
- $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
-
-cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
-
-offsets_arm.s: mkoffsets
- @echo Generating assembler offsets
- ./mkoffsets > $@
-
-bytecodes_arm.s: bytecodes_arm.def mkbc
- @echo Generatine ARM assembler bytecode sequences
- $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
-
-mkbc: $(GAMMADIR)/tools/mkbc.c
- @echo Compiling mkbc tool
- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
-
-mkoffsets: asm_helper.cpp
- @echo Compiling offset generator
- $(QUIETLY) $(REMOVE_TARGET)
- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
-
-endif
-
-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-
-# Specify that the CPU is little endian, if necessary
-ifeq ($(ZERO_ENDIANNESS), little)
- CFLAGS += -DVM_LITTLE_ENDIAN
-endif
-
-# Specify that the CPU is 64 bit, if necessary
-ifeq ($(ZERO_BITSPERWORD), 64)
- CFLAGS += -D_LP64=1
-endif
-
-OPT_CFLAGS/compactingPermGenGen.o = -O1
diff -r c18ada9920f7 ports/hotspot/make/linux/makefiles/shark.make
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/make/linux/makefiles/shark.make Tue Dec 08 09:36:55 2009 +0000
@@ -0,0 +1,32 @@
+#
+# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2008 Red Hat, Inc.
+# 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.
+#
+# 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.
+#
+#
+
+# Sets make macros for making shark version of VM
+
+TYPE = SHARK
+
+VM_SUBDIR = server
+
+CFLAGS += -DSHARK
diff -r c18ada9920f7 ports/hotspot/make/linux/makefiles/zero.make
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/make/linux/makefiles/zero.make Tue Dec 08 09:36:55 2009 +0000
@@ -0,0 +1,32 @@
+#
+# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2009 Red Hat, Inc.
+# 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.
+#
+# 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.
+#
+#
+
+# Setup for Zero (non-Shark) version of VM
+
+# Select which includeDB files to use (in top.make)
+TYPE = ZERO
+
+# Install libjvm.so, etc in in server directory.
+VM_SUBDIR = server
diff -r c18ada9920f7 ports/hotspot/make/linux/makefiles/zeroshark.make
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/make/linux/makefiles/zeroshark.make Tue Dec 08 09:36:55 2009 +0000
@@ -0,0 +1,76 @@
+#
+# Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007, 2008 Red Hat, Inc.
+# 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.
+#
+# 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.
+#
+#
+
+# Setup common to Zero (non-Shark) and Shark versions of VM
+
+ifeq ($(ZERO_LIBARCH),arm)
+
+Obj_Files += asm_helper.o
+Obj_Files += cppInterpreter_arm.o
+
+CFLAGS += -DHOTSPOT_ASM
+
+%.o: %.S
+ @echo Assembling $<
+ $(QUIETLY) $(REMOVE_TARGET)
+ $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+
+cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
+
+offsets_arm.s: mkoffsets
+ @echo Generating assembler offsets
+ ./mkoffsets > $@
+
+bytecodes_arm.s: bytecodes_arm.def mkbc
+ @echo Generatine ARM assembler bytecode sequences
+ $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
+
+mkbc: $(GAMMADIR)/tools/mkbc.c
+ @echo Compiling mkbc tool
+ $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
+
+mkoffsets: asm_helper.cpp
+ @echo Compiling offset generator
+ $(QUIETLY) $(REMOVE_TARGET)
+ $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+
+endif
+
+# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
+
+# Specify that the CPU is little endian, if necessary
+ifeq ($(ZERO_ENDIANNESS), little)
+ CFLAGS += -DVM_LITTLE_ENDIAN
+endif
+
+# Specify that the CPU is 64 bit, if necessary
+ifeq ($(ARCH_DATA_MODEL), 64)
+ CFLAGS += -D_LP64=1
+endif
+
+OPT_CFLAGS/compactingPermGenGen.o = -O1
diff -r c18ada9920f7 ports/hotspot/make/linux/platform_zero.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/make/linux/platform_zero.in Tue Dec 08 09:36:55 2009 +0000
@@ -0,0 +1,17 @@
+os_family = linux
+
+arch = zero
+
+arch_model = zero
+
+os_arch = linux_zero
+
+os_arch_model = linux_zero
+
+lib_arch = zero
+
+compiler = gcc
+
+gnu_dis_arch = zero
+
+sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D at ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
diff -r c18ada9920f7 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Mon Dec 07 11:11:29 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Tue Dec 08 09:36:55 2009 +0000
@@ -61,8 +61,3 @@
address ShouldNotCallThisStub();
address ShouldNotCallThisEntry();
-
-// Nothing to do with the assembler (or lack of),
-// just a real convenient place to include these.
-#include <entry_zero.hpp>
-#include <stack_zero.hpp>
diff -r c18ada9920f7 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 07 11:11:29 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Dec 08 09:36:55 2009 +0000
@@ -78,6 +78,7 @@
#define regset r3-r11
+// XXX hardwired constants!
#define tos_btos 0
#define tos_ctos 1
#define tos_stos 2
@@ -89,11 +90,13 @@
#include "offsets_arm.s"
+// XXX hardwired constants!
#define RESOURCEAREA_AREA 0
#define RESOURCEAREA_CHUNK 4
#define RESOURCEAREA_HWM 8
#define RESOURCEAREA_MAX 12
+// XXX hardwired constants!
#define ISTATE_THREAD 0
#define ISTATE_BCP 4
#define ISTATE_LOCALS 8
@@ -104,19 +107,22 @@
#define ISTATE_ADVANCE_PC 28
#define ISTATE_MSG 28
#define ISTATE_CALLEE 32 // union frame_manager_message
-
#define ISTATE_PREV_LINK 44
#define ISTATE_OOP_TEMP 48
#define ISTATE_STACK_BASE 52
#define ISTATE_STACK_LIMIT 56
#define ISTATE_MONITOR_BASE 60
#define ISTATE_SELF_LINK 64
-#define ISTATE_CAFEBABF 68
-
+#define ISTATE_FRAME_TYPE 68
#define ISTATE_NEXT_FRAME 72
-
#define FRAME_SIZE 76
+// XXX hardwired constants!
+#define ENTRY_FRAME 1
+#define INTERPRETER_FRAME 2
+#define SHARK_FRAME 3
+#define FAKE_STUB_FRAME 4
+
#define last_implemented_bytecode 201
.macro ALIGN_CODE
@@ -428,12 +434,9 @@
.macro CHECK_FRAME
#ifdef DISPATCH_ASSERTS
- @ Check 0xCAFEBABF hasn't been overwritten
- ldr r1, [istate, #ISTATE_CAFEBABF]
- mvn ip, #0x540 @ form 0xCAFEBABF
- bic ip, ip, #0x14000
- bic ip, ip, #0x35000000
- cmp r1, ip
+ @ Check #INTERPRETER_FRAME hasn't been overwritten
+ ldr r1, [istate, #ISTATE_FRAME_TYPE]
+ cmp r1, #INTERPRETER_FRAME
ABORTNE
@ Check we are still the topmost frame
ldr r1, [istate, #ISTATE_THREAD]
@@ -441,12 +444,11 @@
add r2, istate, #ISTATE_NEXT_FRAME
cmp r1, r2
ABORTNE
- @ And check the NEXT_FRAME pointer points to a valid frame (CAFEBABF intact)
+ @ And check the NEXT_FRAME pointer points to a valid frame
ldr r1, [istate, #ISTATE_NEXT_FRAME]
- ldr r2, [r1, #-ISTATE_NEXT_FRAME + ISTATE_CAFEBABF]
- bic r2, r2, #0xff @ ECN: Allow for differing frames
- bic ip, ip, #0xff @ Eg. ENTRY_FRAME/INTERPRETER_FRAME/SHARK_FRAME
- cmp r2, ip
+ ldr r2, [r1, #-ISTATE_NEXT_FRAME + ISTATE_FRAME_TYPE]
+ bic r2, r2, #7 @ ECN: Allow for differing frames
+ cmp r2, #0
ABORTNE
#endif
.endm
@@ -454,17 +456,13 @@
.macro CHECK_BACKTRACE
#ifdef DISPATCH_ASSERTS
add r3, istate, #ISTATE_NEXT_FRAME
- mvn ip, #0x540 @ form 0xCAFEBABF
- bic ip, ip, #0x14000
- bic ip, ip, #0x35000000
@ ECN: Only check a limited no of frames back. topmost frame already checked
@ Check 2nd frame up
ldr r3, [r3]
- ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CAFEBABF]
- bic r1, ip, #1
- cmp r1, r2
- beq 2f
- cmp ip, r2
+ ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_FRAME_TYPE]
+ cmp r2, #ENTRY_FRAME
+ beq 2f
+ cmp ip, #INTERPRETER_FRAME
ABORTNE @ Must be ENTRY_FRAME, or INTERPRETER_FRAME
ldr r1, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CONSTANTS]
ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
@@ -474,11 +472,10 @@
ABORTNE
@ Check 3rd frame up
ldr r3, [r3]
- ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CAFEBABF]
- bic r1, ip, #1
- cmp r1, r2
- beq 2f
- cmp ip, r2
+ ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_FRAME_TYPE]
+ cmp r2, #ENTRY_FRAME
+ beq 2f
+ cmp r2, #INTERPRETER_FRAME
ABORTNE @ Must be ENTRY_FRAME, or INTERPRETER_FRAME
ldr r1, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CONSTANTS]
ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
@@ -488,11 +485,10 @@
ABORTNE
@ Check 4th frame up
ldr r3, [r3]
- ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CAFEBABF]
- bic r1, ip, #1
- cmp r1, r2
- beq 2f
- cmp ip, r2
+ ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_FRAME_TYPE]
+ cmp r2, #ENTRY_FRAME
+ beq 2f
+ cmp r2, #INTERPRETER_FRAME
ABORTNE @ Must be ENTRY_FRAME, or INTERPRETER_FRAME
ldr r1, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CONSTANTS]
ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
@@ -502,11 +498,10 @@
ABORTNE
@ Check 5th frame up
ldr r3, [r3]
- ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CAFEBABF]
- bic r1, ip, #1
- cmp r1, r2
- beq 2f
- cmp ip, r2
+ ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_FRAME_TYPE]
+ cmp r2, #ENTRY_FRAME
+ beq 2f
+ cmp r2, #INTERPRETER_FRAME
ABORTNE @ Must be ENTRY_FRAME, or INTERPRETER_FRAME
ldr r1, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CONSTANTS]
ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
@@ -516,11 +511,10 @@
ABORTNE
@ Check 7th frame up
ldr r3, [r3]
- ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CAFEBABF]
- bic r1, ip, #1
- cmp r1, r2
- beq 2f
- cmp ip, r2
+ ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_FRAME_TYPE]
+ cmp r2, #ENTRY_FRAME
+ beq 2f
+ cmp r2, #INTERPRETER_FRAME
ABORTNE @ Must be ENTRY_FRAME, or INTERPRETER_FRAME
ldr r1, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CONSTANTS]
ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
@@ -530,11 +524,10 @@
ABORTNE
@ Check 8th frame up
ldr r3, [r3]
- ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CAFEBABF]
- bic r1, ip, #1
- cmp r1, r2
- beq 2f
- cmp ip, r2
+ ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_FRAME_TYPE]
+ cmp r2, #ENTRY_FRAME
+ beq 2f
+ cmp r2, #INTERPRETER_FRAME
ABORTNE @ Must be ENTRY_FRAME, or INTERPRETER_FRAME
ldr r1, [r3, #-ISTATE_NEXT_FRAME + ISTATE_CONSTANTS]
ldr r2, [r3, #-ISTATE_NEXT_FRAME + ISTATE_METHOD]
@@ -1030,9 +1023,7 @@
addne r6, r0, r6, asl #2
sub ip, r0, #4
str ip, [r3, #8]
- mvn ip, #0x540 @ form 0xCAFEBABF
- bic ip, ip, #0x14000
- bic ip, ip, #0x35000000
+ mov ip, #INTERPRETER_FRAME
str r4, [r0, #-4]
ldr r0, [r3, #8]
sub r8, r0, #4
@@ -1326,14 +1317,12 @@
ldr r4, [r2, #THREAD_JAVA_SP]
ldr r3, [r2, #THREAD_TOP_ZERO_FRAME]
mov r0, #0
- mvn ip, #0x540 @ form 0xCAFEBABF in ip
+ mov ip, #INTERPRETER_FRAME
sub r9, r4, #FRAME_SIZE
- bic ip, ip, #0x14000
str r9, [r2, #THREAD_JAVA_SP] @ drop stack
sub r5, r9, #4 @ stack limit = r9 - 4
- bic ip, ip, #0x35000000
str r3, [r9, #ISTATE_NEXT_FRAME]
- str ip, [r9, #ISTATE_CAFEBABF]
+ str ip, [r9, #ISTATE_FRAME_TYPE]
str r9, [r9, #ISTATE_MONITOR_BASE]
str r5, [r9, #ISTATE_STACK_LIMIT]
str r9, [r9, #ISTATE_STACK_BASE]
@@ -4627,9 +4616,8 @@
ldrh r0, [tmp2, #METHOD_MAXLOCALS]
mov r1, #0
ldrh r3, [tmp2, #METHOD_SIZEOFPARAMETERS]
- mvn ip, #0x540 @ form 0xCAFEBABF in ip
+ mov ip, #INTERPRETER_FRAME
ldrh r2, [tmp2, #METHOD_MAXSTACK]
- bic ip, ip, #0x35000000
sub r7, r0, r3
ldr r3, [tmp1, #THREAD_JAVA_STACK_BASE]
@@ -4641,7 +4629,6 @@
subs r5, r7, #2
tst r7, #1
- bic ip, ip, #0x14000
strne r1, [stack, #-4]!
bcc 3f
1:
@@ -4657,7 +4644,7 @@
str r2, [tmp1, #THREAD_JAVA_SP]
sub r5, r2, #4 @ stack limit = istate - stackwords - 4
str r3, [istate, #ISTATE_NEXT_FRAME]
- str ip, [istate, #ISTATE_CAFEBABF]
+ str ip, [istate, #ISTATE_FRAME_TYPE]
@ str istate, [istate, #ISTATE_SELF_LINK]
str istate, [istate, #ISTATE_MONITOR_BASE]
str r5, [istate, #ISTATE_STACK_LIMIT]
diff -r c18ada9920f7 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Mon Dec 07 11:11:29 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Tue Dec 08 09:36:55 2009 +0000
@@ -37,6 +37,7 @@
}
frame frame::sender_for_entry_frame(RegisterMap *map) const {
+ assert(zeroframe()->is_entry_frame(), "wrong type of frame");
assert(map != NULL, "map must be set");
assert(!entry_frame_is_first(), "next Java fp must be non zero");
assert(entry_frame_call_wrapper()->anchor()->last_Java_sp() == sender_sp(),
@@ -47,6 +48,9 @@
}
frame frame::sender_for_nonentry_frame(RegisterMap *map) const {
+ assert(zeroframe()->is_interpreter_frame() ||
+ zeroframe()->is_shark_frame() ||
+ zeroframe()->is_fake_stub_frame(), "wrong type of frame");
return frame(sender_sp(), sp() + 1);
}
diff -r c18ada9920f7 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Mon Dec 07 11:11:29 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Tue Dec 08 09:36:55 2009 +0000
@@ -23,11 +23,6 @@
*
*/
-#include <entryFrame_zero.hpp>
-#include <interpreterFrame_zero.hpp>
-#include <sharkFrame_zero.hpp>
-#include <fakeStubFrame_zero.hpp>
-
// Constructors
inline frame::frame() {
diff -r c18ada9920f7 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Mon Dec 07 11:11:29 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Tue Dec 08 09:36:55 2009 +0000
@@ -23,10 +23,8 @@
*
*/
-//
// Set the default values for platform dependent flags used by the
// runtime system. See globals.hpp for details of what they do.
-//
define_pd_global(bool, ConvertSleepToYield, true);
define_pd_global(bool, ShareVtableStubs, true);
diff -r c18ada9920f7 ports/hotspot/src/cpu/zero/vm/stack_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/stack_zero.hpp Mon Dec 07 11:11:29 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/stack_zero.hpp Tue Dec 08 09:36:55 2009 +0000
@@ -124,7 +124,7 @@
};
enum FrameType {
- ENTRY_FRAME = 0xCAFEBABE,
+ ENTRY_FRAME = 1,
INTERPRETER_FRAME,
SHARK_FRAME,
FAKE_STUB_FRAME
diff -r c18ada9920f7 ports/hotspot/src/share/vm/includeDB_zero
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/includeDB_zero Tue Dec 08 09:36:55 2009 +0000
@@ -0,0 +1,55 @@
+//
+// Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
+// Copyright 2009 Red Hat, Inc.
+// 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.
+//
+// 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.
+//
+//
+
+// NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
+
+entryFrame_<arch>.hpp javaCalls.hpp
+entryFrame_<arch>.hpp stack_<arch>.hpp
+
+fakeStubFrame_<arch>.hpp stack_<arch>.hpp
+
+frame.hpp stack_<arch>.hpp
+
+frame.inline.hpp fakeStubFrame_<arch>.hpp
+frame.inline.hpp entryFrame_<arch>.hpp
+frame.inline.hpp interpreterFrame_<arch>.hpp
+frame.inline.hpp sharkFrame_<arch>.hpp
+
+frame_<arch>.cpp interpreterRuntime.hpp
+frame_<arch>.cpp scopeDesc.hpp
+
+interpreter.hpp entry_<arch>.hpp
+
+interpreterFrame_<arch>.hpp bytecodeInterpreter.hpp
+interpreterFrame_<arch>.hpp methodOop.hpp
+interpreterFrame_<arch>.hpp stack_<arch>.hpp
+interpreterFrame_<arch>.hpp thread.hpp
+
+sharkFrame_<arch>.hpp methodOop.hpp
+sharkFrame_<arch>.hpp stack_<arch>.hpp
+
+stack_<arch>.hpp sizes.hpp
+
+thread.hpp stack_<arch>.hpp
More information about the distro-pkg-dev
mailing list