[prev in list] [next in list] [prev in thread] [next in thread]
List: openjdk-distro-pkg-dev
Subject: /hg/icedtea6: Provide support for building with HotSpot 20.
From: andrew () icedtea ! classpath ! org (andrew at icedtea ! classpath ! org)
Date: 2011-01-30 0:45:35
Message-ID: hg.cd6310f10fab.1296348335.2873452341184383832 () icedtea ! classpath ! org
[Download RAW message or body]
changeset cd6310f10fab in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cd6310f10fab
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Jan 30 00:45:18 2011 +0000
Provide support for building with HotSpot 20.
2011-01-29 Andrew John Hughes <ahughes at redhat.com>
* patches/gcc-suffix.patch,
* patches/ia64-fix.patch: Split into original and hs20
versions.
* patches/icedtea-no-precompiled.patch: Apply to original
only.
* patches/icedtea-sparc-buildfixes.patch,
* patches/icedtea-text-relocations.patch,
* patches/icedtea-too-many-args.patch,
* patches/params-cast-size_t.patch: Split into original and
hs20 versions.
* INSTALL: Document new status (original as default,
hs20 as alternative).
* Makefile.am: (ICEDTEA_PATCHES): Updated with changes listed.
(replace-hotspot): Use ${HSBUILD} instead of hardcoded hs19.
* NEWS: List availability of hs20.
* acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Provide hs20 as
alternate build.
* hotspot.map: Add hs20.
* patches/arm.patch: Split bytecodes_zero.hpp changes into original
and hs20 versions.
* patches/hotspot/hs20/arm.patch, hs20 version of
bytecodes_zero.hpp changes.
* patches/hotspot/hs20/gcc-suffix.patch,
* patches/hotspot/hs20/ia64-fix.patch,
* patches/hotspot/hs20/params-cast-size_t.patch,
* patches/hotspot/hs20/sparc-buildfixes.patch: hs20 version of
patches.
* patches/hotspot/hs20/systemtap.patch: hs20 version of
dtrace.hpp changes.
* patches/hotspot/hs20/text-relocations.patch: hs20 versions
of patch.
* patches/hotspot/original/arm.patch: original version of
bytecodes_zero.hpp changes.
* patches/hotspot/original/gcc-suffix.patch,
* patches/hotspot/original/ia64-fix.patch: original versions
of patches moved from patches directory.
* patches/hotspot/original/no-precompiled-headers.patch: Only
for original; USE_PRECOMPILED_HEADER=0 provides the same in
hs20.
* patches/hotspot/original/params-cast-size_t.patch,
* patches/hotspot/original/sparc-buildfixes.patch: original
versions of patches moved from patches directory.
* patches/hotspot/original/systemtap.patch: original version
of dtrace.hpp changes.
* patches/hotspot/original/text-relocations.patch,
* patches/hotspot/original/too-many-args.patch: original
versions of patches moved from patches directory.
* patches/systemtap.patch: Split dtrace.hpp changes into
original and hs20 versions.
diffstat:
31 files changed, 1328 insertions(+), 704 deletions(-)
ChangeLog | 54 +++
INSTALL | 16
Makefile.am | 24 -
NEWS | 1
acinclude.m4 | 2
hotspot.map | 1
patches/arm.patch | 55 ---
patches/gcc-suffix.patch | 31 -
patches/hotspot/hs20/arm.patch | 57 +++
patches/hotspot/hs20/gcc-suffix.patch | 31 +
patches/hotspot/hs20/ia64-fix.patch | 15
patches/hotspot/hs20/params-cast-size_t.patch | 270 +++++++++++++++
patches/hotspot/hs20/sparc-buildfixes.patch | 26 +
patches/hotspot/hs20/systemtap.patch | 100 +++++
patches/hotspot/hs20/text-relocations.patch | 63 +++
patches/hotspot/original/arm.patch | 55 +++
patches/hotspot/original/gcc-suffix.patch | 31 +
patches/hotspot/original/ia64-fix.patch | 30 +
patches/hotspot/original/no-precompiled-headers.patch | 35 ++
patches/hotspot/original/params-cast-size_t.patch | 295 +++++++++++++++++
patches/hotspot/original/sparc-buildfixes.patch | 35 ++
patches/hotspot/original/systemtap.patch | 98 +++++
patches/hotspot/original/text-relocations.patch | 61 +++
patches/hotspot/original/too-many-args.patch | 46 ++
patches/ia64-fix.patch | 30 -
patches/icedtea-no-precompiled.patch | 35 --
patches/icedtea-sparc-buildfixes.patch | 35 --
patches/icedtea-text-relocations.patch | 61 ---
patches/icedtea-too-many-args.patch | 46 --
patches/params-cast-size_t.patch | 295 -----------------
patches/systemtap.patch | 98 -----
diffs (truncated from 2278 to 500 lines):
diff -r c78edcdba40f -r cd6310f10fab ChangeLog
--- a/ChangeLog Mon Jan 24 16:30:51 2011 -0500
+++ b/ChangeLog Sun Jan 30 00:45:18 2011 +0000
@@ -1,3 +1,57 @@ 2011-01-24 Omair Majid <omajid at redhat.
+2011-01-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/gcc-suffix.patch,
+ * patches/ia64-fix.patch:
+ Split into original and hs20 versions.
+ * patches/icedtea-no-precompiled.patch:
+ Apply to original only.
+ * patches/icedtea-sparc-buildfixes.patch,
+ * patches/icedtea-text-relocations.patch,
+ * patches/icedtea-too-many-args.patch,
+ * patches/params-cast-size_t.patch:
+ Split into original and hs20 versions.
+ * INSTALL:
+ Document new status (original as default,
+ hs20 as alternative).
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Updated with changes listed.
+ (replace-hotspot): Use ${HSBUILD} instead of hardcoded hs19.
+ * NEWS: List availability of hs20.
+ * acinclude.m4:
+ (AC_CHECK_WITH_HOTSPOT_BUILD): Provide hs20 as alternate build.
+ * hotspot.map: Add hs20.
+ * patches/arm.patch: Split bytecodes_zero.hpp changes into original
+ and hs20 versions.
+ * patches/hotspot/hs20/arm.patch,
+ hs20 version of bytecodes_zero.hpp changes.
+ * patches/hotspot/hs20/gcc-suffix.patch,
+ * patches/hotspot/hs20/ia64-fix.patch,
+ * patches/hotspot/hs20/params-cast-size_t.patch,
+ * patches/hotspot/hs20/sparc-buildfixes.patch:
+ hs20 version of patches.
+ * patches/hotspot/hs20/systemtap.patch:
+ hs20 version of dtrace.hpp changes.
+ * patches/hotspot/hs20/text-relocations.patch:
+ hs20 versions of patch.
+ * patches/hotspot/original/arm.patch:
+ original version of bytecodes_zero.hpp changes.
+ * patches/hotspot/original/gcc-suffix.patch,
+ * patches/hotspot/original/ia64-fix.patch:
+ original versions of patches moved from patches directory.
+ * patches/hotspot/original/no-precompiled-headers.patch:
+ Only for original; USE_PRECOMPILED_HEADER=0 provides the
+ same in hs20.
+ * patches/hotspot/original/params-cast-size_t.patch,
+ * patches/hotspot/original/sparc-buildfixes.patch:
+ original versions of patches moved from patches directory.
+ * patches/hotspot/original/systemtap.patch:
+ original version of dtrace.hpp changes.
+ * patches/hotspot/original/text-relocations.patch,
+ * patches/hotspot/original/too-many-args.patch:
+ original versions of patches moved from patches directory.
+ * patches/systemtap.patch:
+ Split dtrace.hpp changes into original and hs20 versions.
+
2011-01-24 Omair Majid <omajid at redhat.com>
* NEWS: Update with the 3 backports
diff -r c78edcdba40f -r cd6310f10fab INSTALL
--- a/INSTALL Mon Jan 24 16:30:51 2011 -0500
+++ b/INSTALL Sun Jan 30 00:45:18 2011 +0000
@@ -165,7 +165,7 @@ These are documented fully in the releva
* --enable-cacao: Replace HotSpot with the CACAO VM.
* --enable-shark: Build the Shark LLVM-based JIT.
* --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
-* --with-hotspot-build: The HotSpot to use, defaulting to 'hs19'.
+* --with-hotspot-build: The HotSpot to use, defaulting to 'original'.
* --with-rhino: Include Javascript support using Rhino.
* --with-additional-vms=vm-list: Additional VMs to build using the system described
below.
@@ -301,16 +301,16 @@ download stage and just verifies that th
download stage and just verifies that the zip's MD5 sum matches that
of the requested build.
-At present, IcedTea6 supports the 'original' HotSpot 17 provided as
-part of the upstream tarball and HotSpot 19 ('hs19') from the stable
-hs19 tree at http://hg.openjdk.java.net/hsx/hsx19/master. The default
-is 'hs19'; passing --with-hotspot-build=original to configure will
-revert to the version of hs17 provided in b20. Note that the norm. is
+At present, IcedTea6 supports the 'original' HotSpot 19 provided as
+part of the upstream tarball and HotSpot 20 ('hs20') from the stable
+hs20 tree at http://hg.openjdk.java.net/hsx/hsx20/baseline. The default
+is 'original'; passing --with-hotspot-build=hs20 to configure will
+use the version of hs20 specified in hotspot.map. Note that the norm. is
for up to one alternate (non-default) build to be supported and just
passing --with-hotspot-build (equivalent to --with-hotspot-build=yes)
-will always provide the alternate build (currently hs19). Conversely,
+will always provide the alternate build (currently hs20). Conversely,
passing --with-hotspot-build=no provides the original build (currently
-hs17).
+hs19).
Javascript Support
==================
diff -r c78edcdba40f -r cd6310f10fab Makefile.am
--- a/Makefile.am Mon Jan 24 16:30:51 2011 -0500
+++ b/Makefile.am Sun Jan 30 00:45:18 2011 +0000
@@ -183,7 +183,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-lucene-crash.patch \
patches/icedtea-version.patch \
patches/icedtea-version-hotspot.patch \
- patches/icedtea-text-relocations.patch \
+ patches/hotspot/$(HSBUILD)/text-relocations.patch \
patches/icedtea-ssl.patch \
patches/icedtea-rmi_amd64.patch \
patches/icedtea-tools.patch \
@@ -191,7 +191,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-headers.patch \
patches/icedtea-headers-hotspot.patch \
patches/icedtea-gcc-suffix.patch \
- patches/gcc-suffix.patch \
+ patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/memory-limits.patch \
patches/icedtea-sunsrc.patch \
@@ -210,7 +210,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-alt-jar.patch \
patches/icedtea-jdk-use-ssize_t.patch \
patches/icedtea-use-idx_t.patch \
- patches/params-cast-size_t.patch \
+ patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
patches/icedtea-arch.patch \
patches/icedtea-lc_ctype.patch \
@@ -221,7 +221,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
patches/icedtea-pr261.patch \
- patches/icedtea-sparc-buildfixes.patch \
+ patches/hotspot/$(HSBUILD)/sparc-buildfixes.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
@@ -237,7 +237,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-disable-cc-incompatible-sanity-checks.patch \
patches/icedtea-explicit-target-arch.patch \
patches/icedtea-gcc-stack-markings.patch \
- patches/icedtea-no-precompiled.patch \
patches/icedtea-parisc.patch \
patches/icedtea-sh4-support.patch \
patches/icedtea-policy-evaluation.patch \
@@ -246,6 +245,7 @@ ICEDTEA_PATCHES = \
patches/applet_hole.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
+ patches/hotspot/$(HSBUILD)/arm.patch \
patches/debug-dir.patch \
patches/no-sync.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -253,7 +253,6 @@ ICEDTEA_PATCHES = \
patches/fonts-rhel.patch \
patches/fonts-gentoo.patch \
patches/ipv4-mapped-ipv6-addresses.patch \
- patches/icedtea-too-many-args.patch \
patches/icedtea-jtreg-OpenGLContextInit.patch \
patches/openjdk/6510892-httpserver_test.patch \
patches/openjdk/6638712-wildcard_types.patch \
@@ -261,7 +260,6 @@ ICEDTEA_PATCHES = \
patches/numa_on_early_glibc.patch \
patches/icedtea-jtreg-international-fonts.patch \
patches/openjdk/6967436-6976265-6967434-pisces.patch \
- patches/openjdk/6997495-test_correction_6857159.patch \
patches/f14-fonts.patch \
patches/jtreg-WindowWithWarningTest.patch \
patches/jtreg-T6638712-fix.patch \
@@ -272,12 +270,19 @@ ICEDTEA_PATCHES = \
patches/openjdk/6800846-printing-quality.patch \
patches/rh661505-jpeg.patch \
patches/6703377-freetypescaler.patch \
- patches/ia64-fix.patch \
+ patches/hotspot/$(HSBUILD)/ia64-fix.patch \
patches/openjdk/6642612-filechooser_button_sizes.patch \
patches/jtreg-international-fonts-styles.patch \
patches/openjdk/6736649-text_bearings.patch \
patches/openjdk/6797139-jbutton_truncation.patch \
patches/openjdk/6883341-text_bearing_exception.patch
+
+if !WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+ patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \
+ patches/hotspot/$(HSBUILD)/too-many-args.patch \
+ patches/openjdk/6997495-test_correction_6857159.patch
+endif
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -319,6 +324,7 @@ endif
if ENABLE_SYSTEMTAP
ICEDTEA_PATCHES += patches/systemtap.patch \
+ patches/hotspot/$(HSBUILD)/systemtap.patch \
patches/systemtap-gcc-4.5.patch \
patches/systemtap-alloc-size-workaround.patch
endif
@@ -845,7 +851,7 @@ if WITH_ALT_HSBUILD
then \
$(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
dir=$$($(AWK) 'version==$$1 {print gensub(/.*\/([^/]*)$$/,"\\1","g",$$2)}' \
- version=hs19 $(abs_top_srcdir)/hotspot.map) ; \
+ version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map) ; \
chmod -R ug+w $$dir-* ; \
mv $$dir-$$($(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) \
$(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \
diff -r c78edcdba40f -r cd6310f10fab NEWS
--- a/NEWS Mon Jan 24 16:30:51 2011 -0500
+++ b/NEWS Sun Jan 30 00:45:18 2011 +0000
@@ -14,6 +14,7 @@ New in release 1.10 (2011-XX-XX):
release cycle.
* Shark provided upstream rather than as part of IcedTea.
* The option --with-openjdk becomes --with-jdk-home and --disable-bootstrap
+* Support for building with HotSpot 20 from its stable tree
* Import of OpenJDK6 b21 including upgrade to HotSpot 19
- S6961870: More rebranding fixes for templates/gpl-*-header files
- S6976186: Shark build system changes
diff -r c78edcdba40f -r cd6310f10fab acinclude.m4
--- a/acinclude.m4 Mon Jan 24 16:30:51 2011 -0500
+++ b/acinclude.m4 Sun Jan 30 00:45:18 2011 +0000
@@ -917,7 +917,7 @@ AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
[
ORIGINAL_BUILD="original"
- ALTERNATE_BUILD="original"
+ ALTERNATE_BUILD="hs20"
DEFAULT_BUILD=${ORIGINAL_BUILD}
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
diff -r c78edcdba40f -r cd6310f10fab hotspot.map
--- a/hotspot.map Mon Jan 24 16:30:51 2011 -0500
+++ b/hotspot.map Sun Jan 30 00:45:18 2011 +0000
@@ -1,1 +1,2 @@
# version url changeset md5sum
+hs20 http://hg.openjdk.java.net/hsx/hsx20/baseline 6aa467001334 \
236fa9a7fdb01339184378bb35e42e34
diff -r c78edcdba40f -r cd6310f10fab patches/arm.patch
--- a/patches/arm.patch Mon Jan 24 16:30:51 2011 -0500
+++ b/patches/arm.patch Sun Jan 30 00:45:18 2011 +0000
@@ -112,61 +112,6 @@ diff -Nru openjdk.orig/hotspot/src/cpu/z
+
+#endif // HOTSPOT_ASM
}
-diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp \
openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
---- openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2010-05-28 \
11:10:30.000000000 +0100
-+++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2010-06-17 17:28:49.000000000 \
+0100
-@@ -1,6 +1,7 @@
- /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2009 Red Hat, Inc.
-+ * Copyright 2009 Edward Nevill
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,4 +24,42 @@
- *
- */
-
--// This file is intentionally empty
-+#ifdef HOTSPOT_ASM
-+#define _iaccess_0 ((Bytecodes::Code)0xdb)
-+#define _iaccess_1 ((Bytecodes::Code)0xdc)
-+#define _iaccess_2 ((Bytecodes::Code)0xdd)
-+#define _iaccess_3 ((Bytecodes::Code)0xde)
-+
-+#define _invokeresolved ((Bytecodes::Code)0xdf)
-+#define _invokespecialresolved ((Bytecodes::Code)0xe0)
-+#define _invokestaticresolved ((Bytecodes::Code)0xe1)
-+
-+#define _iload_iload ((Bytecodes::Code)0xe3)
-+#define _iload_iload_N ((Bytecodes::Code)0xe4)
-+
-+#define _dmac ((Bytecodes::Code)0xe6)
-+
-+ _iload_0_iconst_N , // 231
-+ _iload_1_iconst_N , // 232
-+ _iload_2_iconst_N , // 233
-+ _iload_3_iconst_N , // 234
-+ _iload_iconst_N , // 235
-+ _iadd_istore_N , // 236
-+ _isub_istore_N , // 237
-+ _iand_istore_N , // 238
-+ _ior_istore_N , // 239
-+ _ixor_istore_N , // 240
-+ _iadd_u4store , // 241
-+ _isub_u4store , // 242
-+ _iand_u4store , // 243
-+ _ior_u4store , // 244
-+ _ixor_u4store , // 245
-+ _iload_0_iload , // 246
-+ _iload_1_iload , // 247
-+ _iload_2_iload , // 248
-+ _iload_3_iload , // 249
-+ _iload_0_iload_N , // 250
-+ _iload_1_iload_N , // 251
-+ _iload_2_iload_N , // 252
-+ _iload_3_iload_N , // 253
-+#endif // HOTSPOT_ASM
diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp \
openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-06-16 \
14:11:07.000000000 +0100 +++ \
openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-06-17 17:30:02.000000000 \
+0100
diff -r c78edcdba40f -r cd6310f10fab patches/gcc-suffix.patch
--- a/patches/gcc-suffix.patch Mon Jan 24 16:30:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile \
openjdk/hotspot/agent/src/os/linux/Makefile
---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2010-09-01 01:23:45.000000000 \
+0100
-+++ openjdk/hotspot/agent/src/os/linux/Makefile 2010-09-19 14:09:17.907131214 +0100
-@@ -23,7 +23,7 @@
- #
-
- ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` \
= "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; \
else echo i386 ; fi )
--GCC = gcc
-+GCC = gcc$(GCC_SUFFIX)
-
- JAVAH = ${JAVA_HOME}/bin/javah
-
-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 2010-09-19 14:07:15.000000000 \
+0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-09-19 14:09:58.015272246 \
+0100
-@@ -26,11 +26,11 @@
- # CC, CPP & AS
-
- ifdef ALT_COMPILER_PATH
--CPP = $(ALT_COMPILER_PATH)/g++
--CC = $(ALT_COMPILER_PATH)/gcc
-+CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX)
-+CC = $(ALT_COMPILER_PATH)/gcc$(GCC_SUFFIX)
- else
--CPP = g++
--CC = gcc
-+CPP = g++$(GCC_SUFFIX)
-+CC = gcc$(GCC_SUFFIX)
- endif
-
- AS = $(CC) -c
diff -r c78edcdba40f -r cd6310f10fab patches/hotspot/hs20/arm.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs20/arm.patch Sun Jan 30 00:45:18 2011 +0000
@@ -0,0 +1,57 @@
+diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp \
openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp +--- \
openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-25 22:57:24.000000000 \
+0000 ++++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-28 \
01:46:18.769782690 +0000 +@@ -1,6 +1,7 @@
+ /*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009 Red Hat, Inc.
++ * Copyright 2009 Edward Nevill
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -26,6 +27,44 @@
+ #ifndef CPU_ZERO_VM_BYTECODES_ZERO_HPP
+ #define CPU_ZERO_VM_BYTECODES_ZERO_HPP
+
+-// This file is intentionally empty
++#ifdef HOTSPOT_ASM
++#define _iaccess_0 ((Bytecodes::Code)0xdb)
++#define _iaccess_1 ((Bytecodes::Code)0xdc)
++#define _iaccess_2 ((Bytecodes::Code)0xdd)
++#define _iaccess_3 ((Bytecodes::Code)0xde)
++
++#define _invokeresolved ((Bytecodes::Code)0xdf)
++#define _invokespecialresolved ((Bytecodes::Code)0xe0)
++#define _invokestaticresolved ((Bytecodes::Code)0xe1)
++
++#define _iload_iload ((Bytecodes::Code)0xe3)
++#define _iload_iload_N ((Bytecodes::Code)0xe4)
++
++#define _dmac ((Bytecodes::Code)0xe6)
++
++ _iload_0_iconst_N , // 231
++ _iload_1_iconst_N , // 232
++ _iload_2_iconst_N , // 233
++ _iload_3_iconst_N , // 234
++ _iload_iconst_N , // 235
++ _iadd_istore_N , // 236
++ _isub_istore_N , // 237
++ _iand_istore_N , // 238
++ _ior_istore_N , // 239
++ _ixor_istore_N , // 240
++ _iadd_u4store , // 241
++ _isub_u4store , // 242
++ _iand_u4store , // 243
++ _ior_u4store , // 244
++ _ixor_u4store , // 245
++ _iload_0_iload , // 246
++ _iload_1_iload , // 247
++ _iload_2_iload , // 248
++ _iload_3_iload , // 249
++ _iload_0_iload_N , // 250
++ _iload_1_iload_N , // 251
++ _iload_2_iload_N , // 252
++ _iload_3_iload_N , // 253
++#endif // HOTSPOT_ASM
+
+ #endif // CPU_ZERO_VM_BYTECODES_ZERO_HPP
diff -r c78edcdba40f -r cd6310f10fab patches/hotspot/hs20/gcc-suffix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs20/gcc-suffix.patch Sun Jan 30 00:45:18 2011 +0000
@@ -0,0 +1,31 @@
+diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile \
openjdk/hotspot/agent/src/os/linux/Makefile +--- \
openjdk.orig/hotspot/agent/src/os/linux/Makefile 2011-01-25 22:57:24.000000000 +0000 \
++++ openjdk/hotspot/agent/src/os/linux/Makefile 2011-01-28 00:43:20.632487152 +0000 \
+@@ -23,7 +23,7 @@ + #
+
+ ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` \
= "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; \
else echo i386 ; fi ) +-GCC = gcc
++GCC = gcc$(GCC_SUFFIX)
+
+ JAVAH = ${JAVA_HOME}/bin/javah
+
+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 2011-01-28 00:35:53.000000000 \
+0000 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2011-01-28 \
00:43:56.676866099 +0000 +@@ -28,11 +28,11 @@
+ # When cross-compiling the ALT_COMPILER_PATH points
+ # to the cross-compilation toolset
+ ifdef CROSS_COMPILE_ARCH
+-CPP = $(ALT_COMPILER_PATH)/g++
+-CC = $(ALT_COMPILER_PATH)/gcc
++CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX)
++CC = $(ALT_COMPILER_PATH)/gcc$(GCC_SUFFIX)
+ else
+-CPP = g++
+-CC = gcc
++CPP = g++$(GCC_SUFFIX)
++CC = gcc$(GCC_SUFFIX)
+ endif
+
+ AS = $(CC) -c
diff -r c78edcdba40f -r cd6310f10fab patches/hotspot/hs20/ia64-fix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs20/ia64-fix.patch Sun Jan 30 00:45:18 2011 +0000
@@ -0,0 +1,15 @@
+--- openjdk/hotspot/src/share/vm/opto/connode.cpp~ 2010-10-08 20:29:24.000000000 \
+0000 ++++ openjdk/hotspot/src/share/vm/opto/connode.cpp 2010-11-29 \
07:57:22.000000000 +0000 +@@ -712,12 +712,7 @@
+ if( t == Type::TOP ) return Type::TOP;
+ if( t == Type::FLOAT ) return Type::DOUBLE;
+ const TypeF *tf = t->is_float_constant();
+-#ifndef IA64
+ return TypeD::make( (double)tf->getf() );
+-#else
+- float x = tf->getf();
+- return TypeD::make( (x == 0.0f) ? (double)x : (double)x + ia64_double_zero );
+-#endif
+ }
+
+ //=============================================================================
diff -r c78edcdba40f -r cd6310f10fab patches/hotspot/hs20/params-cast-size_t.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs20/params-cast-size_t.patch Sun Jan 30 00:45:18 2011 +0000
@@ -0,0 +1,270 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp \
openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2011-01-25 \
22:57:24.000000000 +0000 ++++ \
openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2011-01-28 \
01:06:11.887088930 +0000 +@@ -2645,7 +2645,7 @@
+ if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
+ size_t multiple = \
_num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks); + \
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks; +- n_blks = MIN2(n_blks, \
CMSOldPLABMax); ++ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
+ }
+ assert(n_blks > 0, "Error");
+ _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp \
openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2011-01-25 \
22:57:24.000000000 +0000 ++++ \
openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2011-01-28 \
01:06:11.891088974 +0000 +@@ -955,7 +955,7 @@
+ if (free_percentage < desired_free_percentage) {
+ size_t desired_capacity = (size_t)(used() / ((double) 1 - \
desired_free_percentage)); + assert(desired_capacity >= capacity(), "invalid \
expansion size"); +- expand_bytes = MAX2(desired_capacity - capacity(), \
MinHeapDeltaBytes); ++ expand_bytes = MAX2((long unsigned int) (desired_capacity - \
capacity()), (long unsigned int) MinHeapDeltaBytes); + }
+ if (expand_bytes > 0) {
+ if (PrintGCDetails && Verbose) {
+@@ -6238,7 +6238,7 @@
+ HeapWord* curAddr = _markBitMap.startWord();
+ while (curAddr < _markBitMap.endWord()) {
+ size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
+- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
++ MemRegion chunk(curAddr, MIN2((size_t) CMSBitMapYieldQuantum, remaining));
+ _markBitMap.clear_large_range(chunk);
+ if (ConcurrentMarkSweepThread::should_yield() &&
+ !foregroundGCIsActive() &&
+@@ -6533,7 +6533,7 @@
+ return;
+ }
+ // Double capacity if possible
+- size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax);
++ size_t new_capacity = MIN2((size_t) (_capacity*2), (size_t) MarkStackSizeMax);
+ // Do not give up existing stack until we have managed to
+ // get the double capacity that we desired.
+ ReservedSpace rs(ReservedSpace::allocation_align_size_up(
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp \
openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp +--- \
openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2011-01-28 \
00:50:00.000000000 +0000 ++++ \
openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2011-01-28 \
01:06:11.891088974 +0000 +@@ -471,7 +471,7 @@
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic