/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 21 16:39:27 PDT 2009
changeset 71a19c78147c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=71a19c78147c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 21 15:04:08 2009 +0100
Support HotSpot 16 tree.
2009-10-21 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/icedtea-hotspot-original.patch:
Renamed to be used in all builds.
* patches/hotspot/original/icedtea-gcc-4.3.patch: Dropped,
redundant.
* patches/hotspot/original/icedtea-includedb.patch: Renamed to
include bug ID.
* patches/icedtea-f2i-overflow.patch: Moved to HotSpot
original directory and renamed to include bug ID.
* patches/icedtea-gcc-4.3.patch: Dropped, redundant.
* patches/icedtea-lib64.patch: Moved to HotSpot original
directory and renamed to include bug ID.
* Makefile.am: Pick up HotSpot URL from hotspot.map, remove
GCC_OLD logic, only apply some patches when building hs14.
* hotspot.map: Add hs16.
* patches/ecj/icedtea-hotspot.patch: Moved from icedtea-hotspot-
original.patch.
* patches/hotspot/default/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/default/icedtea-core-build.patch,
* patches/hotspot/default/icedtea-gcc-stack-markings.patch,
* patches/hotspot/default/icedtea-gcc-suffix.patch,
* patches/hotspot/default/icedtea-headers.patch,
* patches/hotspot/default/icedtea-memory-limits.patch,
* patches/hotspot/default/icedtea-no-precompiled.patch,
* patches/hotspot/default/icedtea-params-cast-size_t.patch,
* patches/hotspot/default/icedtea-parisc-opt.patch,
* patches/hotspot/default/icedtea-shark-build.patch,
* patches/hotspot/default/icedtea-shark.patch,
* patches/hotspot/default/icedtea-sparc-buildfixes.patch,
* patches/hotspot/default/icedtea-sparc-ptracefix.patch,
* patches/hotspot/default/icedtea-sparc-trapsfix.patch,
* patches/hotspot/default/icedtea-sparc64-linux.patch,
* patches/hotspot/default/icedtea-static-libstdc++.patch,
* patches/hotspot/default/icedtea-text-relocations.patch,
* patches/hotspot/default/icedtea-use-idx_t.patch,
* patches/hotspot/default/icedtea-version.patch,
* patches/hotspot/default/icedtea-zero-build.patch: Copied
from hotspot/original.
* patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch:
New patch for hs16 to ignore DeoptimizeALot on product builds;
backported from my fix for JDK7.
* patches/hotspot/original/icedtea-6778657-f2i-overflow.patch,
* patches/hotspot/original/icedtea-6778662-lib64.patch: Moved
from main directory as only needed for hs14. Added Sun bug
IDs.
* patches/hotspot/original/icedtea-6793825-includedb.patch:
Renamed to include bug ID.
* patches/icedtea-use-system-tzdata.patch: Use new
SystemProperty to avoid a GCC warning.
* patches/openjdk/6879689-hotspot_warning_fix.patch:
Backported from my fix in JDK7. Prevents a GCC warning when
compiling with optimisation.
changeset 093116b4e715 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=093116b4e715
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 21 16:37:47 2009 +0100
Reduce number of patches by moving non-version-specific HotSpot
patches to top-level.
2009-10-21 Andrew John Hughes <ahughes at redhat.com>
Move non-version-dependent HotSpot patches back to
top-level.
* patches/hotspot/default/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/default/icedtea-core-build.patch,
* patches/hotspot/default/icedtea-gcc-stack-markings.patch,
* patches/hotspot/default/icedtea-gcc-suffix.patch,
* patches/hotspot/default/icedtea-headers.patch,
* patches/hotspot/default/icedtea-memory-limits.patch,
* patches/hotspot/default/icedtea-no-precompiled.patch,
* patches/hotspot/default/icedtea-parisc-opt.patch,
* patches/hotspot/default/icedtea-shark-build.patch,
* patches/hotspot/default/icedtea-shark.patch,
* patches/hotspot/default/icedtea-sparc-buildfixes.patch,
* patches/hotspot/default/icedtea-sparc-ptracefix.patch,
* patches/hotspot/default/icedtea-sparc-trapsfix.patch,
* patches/hotspot/default/icedtea-sparc64-linux.patch,
* patches/hotspot/default/icedtea-static-libstdc++.patch,
* patches/hotspot/default/icedtea-text-relocations.patch,
* patches/hotspot/default/icedtea-use-idx_t.patch,
* patches/hotspot/default/icedtea-version.patch,
* patches/hotspot/default/icedtea-zero-build.patch: Removed,
duplicates of versions in hotspot/original.
* patches/hotspot/original/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/original/icedtea-core-build.patch,
* patches/hotspot/original/icedtea-gcc-stack-markings.patch,
* patches/hotspot/original/icedtea-gcc-suffix.patch,
* patches/hotspot/original/icedtea-headers.patch,
* patches/hotspot/original/icedtea-memory-limits.patch,
* patches/hotspot/original/icedtea-no-precompiled.patch,
* patches/hotspot/original/icedtea-parisc-opt.patch,
* patches/hotspot/original/icedtea-shark-build.patch,
* patches/hotspot/original/icedtea-shark.patch,
* patches/hotspot/original/icedtea-sparc-buildfixes.patch,
* patches/hotspot/original/icedtea-sparc-ptracefix.patch,
* patches/hotspot/original/icedtea-sparc-trapsfix.patch,
* patches/hotspot/original/icedtea-sparc64-linux.patch,
* patches/hotspot/original/icedtea-static-libstdc++.patch,
* patches/hotspot/original/icedtea-text-relocations.patch,
* patches/hotspot/original/icedtea-use-idx_t.patch,
* patches/hotspot/original/icedtea-version.patch,
* patches/hotspot/original/icedtea-zero-build.patch: Moved to
top-level.
* Makefile.am: Remove $(HSBUILD) in patches moved to the top.
* patches/icedtea-bytecodeInterpreter.patch,
* patches/icedtea-core-build-hotspot.patch,
* patches/icedtea-gcc-stack-markings.patch,
* patches/icedtea-gcc-suffix-hotspot.patch,
* patches/icedtea-headers-hotspot.patch,
* patches/icedtea-memory-limits.patch,
* patches/icedtea-no-precompiled.patch,
* patches/icedtea-parisc-opt.patch,
* patches/icedtea-shark-build-hotspot.patch,
* patches/icedtea-shark.patch,
* patches/icedtea-sparc-buildfixes.patch,
* patches/icedtea-sparc-ptracefix.patch,
* patches/icedtea-sparc-trapsfix.patch,
* patches/icedtea-sparc64-linux.patch,
* patches/icedtea-static-libstdc++.patch,
* patches/icedtea-text-relocations.patch,
* patches/icedtea-use-idx_t.patch,
* patches/icedtea-version-hotspot.patch,
* patches/icedtea-zero-build-hotspot.patch: Moved from
hotspot/original.
changeset 86a05a0cec75 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=86a05a0cec75
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 21 17:00:21 2009 +0100
Correctly use original HotSpot build by default.
2009-10-21 Andrew John Hughes <ahughes at redhat.com>
Correctly use original build by default.
* acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Default should
be "default", it's the no clause that should be changed to
"original".
diffstat:
56 files changed, 2107 insertions(+), 1741 deletions(-)
ChangeLog | 130 +++
Makefile.am | 72 -
acinclude.m4 | 4
hotspot.map | 4
patches/ecj/icedtea-hotspot-original.patch | 48 -
patches/ecj/icedtea-hotspot.patch | 48 +
patches/hotspot/default/icedtea-params-cast-size_t.patch | 252 ++++++
patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch | 33
patches/hotspot/original/icedtea-6778657-f2i-overflow.patch | 96 ++
patches/hotspot/original/icedtea-6778662-lib64.patch | 16
patches/hotspot/original/icedtea-6793825-includedb.patch | 107 ++
patches/hotspot/original/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/original/icedtea-core-build.patch | 108 --
patches/hotspot/original/icedtea-gcc-4.3.patch | 54 -
patches/hotspot/original/icedtea-gcc-stack-markings.patch | 14
patches/hotspot/original/icedtea-gcc-suffix.patch | 25
patches/hotspot/original/icedtea-headers.patch | 13
patches/hotspot/original/icedtea-includedb.patch | 107 --
patches/hotspot/original/icedtea-memory-limits.patch | 23
patches/hotspot/original/icedtea-no-precompiled.patch | 32
patches/hotspot/original/icedtea-parisc-opt.patch | 28
patches/hotspot/original/icedtea-shark-build.patch | 233 -----
patches/hotspot/original/icedtea-shark.patch | 390 ----------
patches/hotspot/original/icedtea-sparc-buildfixes.patch | 35
patches/hotspot/original/icedtea-sparc-ptracefix.patch | 34
patches/hotspot/original/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/original/icedtea-sparc64-linux.patch | 42 -
patches/hotspot/original/icedtea-static-libstdc++.patch | 16
patches/hotspot/original/icedtea-text-relocations.patch | 61 -
patches/hotspot/original/icedtea-use-idx_t.patch | 101 --
patches/hotspot/original/icedtea-version.patch | 48 -
patches/hotspot/original/icedtea-zero-build.patch | 129 ---
patches/icedtea-bytecodeInterpreter.patch | 11
patches/icedtea-core-build-hotspot.patch | 108 ++
patches/icedtea-f2i-overflow.patch | 96 --
patches/icedtea-gcc-4.3.patch | 13
patches/icedtea-gcc-stack-markings.patch | 14
patches/icedtea-gcc-suffix-hotspot.patch | 25
patches/icedtea-headers-hotspot.patch | 13
patches/icedtea-lib64.patch | 16
patches/icedtea-memory-limits.patch | 23
patches/icedtea-no-precompiled.patch | 32
patches/icedtea-parisc-opt.patch | 28
patches/icedtea-shark-build-hotspot.patch | 233 +++++
patches/icedtea-shark.patch | 390 ++++++++++
patches/icedtea-sparc-buildfixes.patch | 35
patches/icedtea-sparc-ptracefix.patch | 34
patches/icedtea-sparc-trapsfix.patch | 21
patches/icedtea-sparc64-linux.patch | 42 +
patches/icedtea-static-libstdc++.patch | 16
patches/icedtea-text-relocations.patch | 61 +
patches/icedtea-use-idx_t.patch | 101 ++
patches/icedtea-use-system-tzdata.patch | 2
patches/icedtea-version-hotspot.patch | 48 +
patches/icedtea-zero-build-hotspot.patch | 129 +++
patches/openjdk/6879689-hotspot_warning_fix.patch | 22
diffs (truncated from 4207 to 500 lines):
diff -r 974b05e6e033 -r 86a05a0cec75 ChangeLog
--- a/ChangeLog Mon Oct 19 23:19:26 2009 +0200
+++ b/ChangeLog Wed Oct 21 17:00:21 2009 +0100
@@ -1,3 +1,133 @@ 2009-10-19 Mark Wielaard <mjw at redhat.c
+2009-10-21 Andrew John Hughes <ahughes at redhat.com>
+
+ Correctly use original build by default.
+ * acinclude.m4:
+ (AC_CHECK_WITH_HOTSPOT_BUILD): Default should
+ be "default", it's the no clause that
+ should be changed to "original".
+
+2009-10-21 Andrew John Hughes <ahughes at redhat.com>
+
+ Move non-version-dependent HotSpot patches back
+ to top-level.
+ * patches/hotspot/default/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/default/icedtea-core-build.patch,
+ * patches/hotspot/default/icedtea-gcc-stack-markings.patch,
+ * patches/hotspot/default/icedtea-gcc-suffix.patch,
+ * patches/hotspot/default/icedtea-headers.patch,
+ * patches/hotspot/default/icedtea-memory-limits.patch,
+ * patches/hotspot/default/icedtea-no-precompiled.patch,
+ * patches/hotspot/default/icedtea-parisc-opt.patch,
+ * patches/hotspot/default/icedtea-shark-build.patch,
+ * patches/hotspot/default/icedtea-shark.patch,
+ * patches/hotspot/default/icedtea-sparc-buildfixes.patch,
+ * patches/hotspot/default/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/default/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/default/icedtea-sparc64-linux.patch,
+ * patches/hotspot/default/icedtea-static-libstdc++.patch,
+ * patches/hotspot/default/icedtea-text-relocations.patch,
+ * patches/hotspot/default/icedtea-use-idx_t.patch,
+ * patches/hotspot/default/icedtea-version.patch,
+ * patches/hotspot/default/icedtea-zero-build.patch:
+ Removed, duplicates of versions in hotspot/original.
+ * patches/hotspot/original/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/original/icedtea-core-build.patch,
+ * patches/hotspot/original/icedtea-gcc-stack-markings.patch,
+ * patches/hotspot/original/icedtea-gcc-suffix.patch,
+ * patches/hotspot/original/icedtea-headers.patch,
+ * patches/hotspot/original/icedtea-memory-limits.patch,
+ * patches/hotspot/original/icedtea-no-precompiled.patch,
+ * patches/hotspot/original/icedtea-parisc-opt.patch,
+ * patches/hotspot/original/icedtea-shark-build.patch,
+ * patches/hotspot/original/icedtea-shark.patch,
+ * patches/hotspot/original/icedtea-sparc-buildfixes.patch,
+ * patches/hotspot/original/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/original/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/original/icedtea-sparc64-linux.patch,
+ * patches/hotspot/original/icedtea-static-libstdc++.patch,
+ * patches/hotspot/original/icedtea-text-relocations.patch,
+ * patches/hotspot/original/icedtea-use-idx_t.patch,
+ * patches/hotspot/original/icedtea-version.patch,
+ * patches/hotspot/original/icedtea-zero-build.patch:
+ Moved to top-level.
+ * Makefile.am:
+ Remove $(HSBUILD) in patches moved to the top.
+ * patches/icedtea-bytecodeInterpreter.patch,
+ * patches/icedtea-core-build-hotspot.patch,
+ * patches/icedtea-gcc-stack-markings.patch,
+ * patches/icedtea-gcc-suffix-hotspot.patch,
+ * patches/icedtea-headers-hotspot.patch,
+ * patches/icedtea-memory-limits.patch,
+ * patches/icedtea-no-precompiled.patch,
+ * patches/icedtea-parisc-opt.patch,
+ * patches/icedtea-shark-build-hotspot.patch,
+ * patches/icedtea-shark.patch,
+ * patches/icedtea-sparc-buildfixes.patch,
+ * patches/icedtea-sparc-ptracefix.patch,
+ * patches/icedtea-sparc-trapsfix.patch,
+ * patches/icedtea-sparc64-linux.patch,
+ * patches/icedtea-static-libstdc++.patch,
+ * patches/icedtea-text-relocations.patch,
+ * patches/icedtea-use-idx_t.patch,
+ * patches/icedtea-version-hotspot.patch,
+ * patches/icedtea-zero-build-hotspot.patch:
+ Moved from hotspot/original.
+
+2009-10-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/ecj/icedtea-hotspot-original.patch:
+ Renamed to be used in all builds.
+ * patches/hotspot/original/icedtea-gcc-4.3.patch:
+ Dropped, redundant.
+ * patches/hotspot/original/icedtea-includedb.patch:
+ Renamed to include bug ID.
+ * patches/icedtea-f2i-overflow.patch:
+ Moved to HotSpot original directory and renamed to include bug ID.
+ * patches/icedtea-gcc-4.3.patch:
+ Dropped, redundant.
+ * patches/icedtea-lib64.patch:
+ Moved to HotSpot original directory and renamed to include bug ID.
+ * Makefile.am:
+ Pick up HotSpot URL from hotspot.map, remove GCC_OLD logic,
+ only apply some patches when building hs14.
+ * hotspot.map: Add hs16.
+ * patches/ecj/icedtea-hotspot.patch: Moved from icedtea-hotspot-original.patch.
+ * patches/hotspot/default/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/default/icedtea-core-build.patch,
+ * patches/hotspot/default/icedtea-gcc-stack-markings.patch,
+ * patches/hotspot/default/icedtea-gcc-suffix.patch,
+ * patches/hotspot/default/icedtea-headers.patch,
+ * patches/hotspot/default/icedtea-memory-limits.patch,
+ * patches/hotspot/default/icedtea-no-precompiled.patch,
+ * patches/hotspot/default/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/default/icedtea-parisc-opt.patch,
+ * patches/hotspot/default/icedtea-shark-build.patch,
+ * patches/hotspot/default/icedtea-shark.patch,
+ * patches/hotspot/default/icedtea-sparc-buildfixes.patch,
+ * patches/hotspot/default/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/default/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/default/icedtea-sparc64-linux.patch,
+ * patches/hotspot/default/icedtea-static-libstdc++.patch,
+ * patches/hotspot/default/icedtea-text-relocations.patch,
+ * patches/hotspot/default/icedtea-use-idx_t.patch,
+ * patches/hotspot/default/icedtea-version.patch,
+ * patches/hotspot/default/icedtea-zero-build.patch:
+ Copied from hotspot/original.
+ * patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch:
+ New patch for hs16 to ignore DeoptimizeALot on product builds;
+ backported from my fix for JDK7.
+ * patches/hotspot/original/icedtea-6778657-f2i-overflow.patch,
+ * patches/hotspot/original/icedtea-6778662-lib64.patch:
+ Moved from main directory as only needed for hs14. Added
+ Sun bug IDs.
+ * patches/hotspot/original/icedtea-6793825-includedb.patch:
+ Renamed to include bug ID.
+ * patches/icedtea-use-system-tzdata.patch:
+ Use new SystemProperty to avoid a GCC warning.
+ * patches/openjdk/6879689-hotspot_warning_fix.patch:
+ Backported from my fix in JDK7. Prevents a GCC warning
+ when compiling with optimisation.
+
2009-10-19 Mark Wielaard <mjw at redhat.com>
* tapset/hotspot_jni.stp.in: New tapset.
diff -r 974b05e6e033 -r 86a05a0cec75 Makefile.am
--- a/Makefile.am Mon Oct 19 23:19:26 2009 +0200
+++ b/Makefile.am Wed Oct 21 17:00:21 2009 +0100
@@ -327,7 +327,6 @@ snapshot: dist
# Download OpenJDK sources.
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
-HOTSPOT_URL = http://hg.openjdk.java.net/hsx/hsx14/master/archive/
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
if USE_ALT_OPENJDK_SRC_ZIP
@@ -412,7 +411,7 @@ if WITH_ALT_HSBUILD
if WITH_ALT_HSBUILD
if USE_ALT_HOTSPOT_SRC_ZIP
else
- hotspot_md5sum="`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) \
+ hotspot_md5sum="`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) \
$(abs_top_srcdir)/hotspot.map`" ; \
if ! echo "$${hotspot_md5sum} $(HOTSPOT_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -421,9 +420,9 @@ else
then \
mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
fi ; \
- changeset="`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \
- $(abs_top_srcdir)/hotspot.map`" ; \
- $(WGET) $(HOTSPOT_URL)$${changeset}.tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+ hotspot_url="`$(AWK) 'version==$$1 {print $$2 "/archive/" $$3 ".tar.gz"}' \
+ version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"; \
+ $(WGET) $${hotspot_url} -O $(HOTSPOT_SRC_ZIP) ; \
fi
endif
endif
@@ -539,29 +538,21 @@ stamps/ports.stamp: stamps/replace-hotsp
mkdir -p stamps
touch stamps/ports.stamp
-# If new gcc is installed, apply 4.3 patch
-if GCC_OLD
- GCC_PATCH =
-else
- GCC_PATCH = patches/icedtea-gcc-4.3.patch \
- patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch
-endif
-
ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
patches/icedtea-notice-safepoints.patch \
- patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
+ patches/icedtea-bytecodeInterpreter.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-zero.patch \
patches/icedtea-ia64-bugfix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \
+ patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
patches/icedtea-version.patch \
- patches/hotspot/$(HSBUILD)/icedtea-version.patch \
+ patches/icedtea-version-hotspot.patch \
patches/icedtea-copy-plugs.patch \
- patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
+ patches/icedtea-text-relocations.patch \
patches/icedtea-ssl.patch \
$(PLUGIN_PATCH) \
patches/icedtea-webstart.patch \
@@ -572,24 +563,23 @@ ICEDTEA_PATCHES = \
patches/icedtea-timezone-default-permission.patch \
patches/icedtea-use-system-tzdata.patch \
patches/icedtea-headers.patch \
- patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
+ patches/icedtea-headers-hotspot.patch \
patches/icedtea-gcc-suffix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \
+ patches/icedtea-gcc-suffix-hotspot.patch \
patches/icedtea-bytebuffer-compact.patch \
- patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
+ patches/icedtea-memory-limits.patch \
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/hotspot/$(HSBUILD)/icedtea-core-build.patch \
+ patches/icedtea-core-build-hotspot.patch \
patches/icedtea-linker-options.patch \
- patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \
+ patches/icedtea-static-libstdc++.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
- patches/hotspot/$(HSBUILD)/icedtea-zero-build.patch \
+ patches/icedtea-zero-build-hotspot.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
@@ -597,25 +587,23 @@ ICEDTEA_PATCHES = \
patches/icedtea-freetypeversion.patch \
patches/icedtea-fonts.patch \
patches/icedtea-shark-build.patch \
- patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
+ patches/icedtea-shark-build-hotspot.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-nomotif-6706121.patch \
patches/icedtea-nomotif.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
patches/icedtea-jdk-use-ssize_t.patch \
- patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \
+ patches/icedtea-use-idx_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
- patches/hotspot/$(HSBUILD)/icedtea-shark.patch \
- $(GCC_PATCH) \
+ patches/icedtea-shark.patch \
patches/icedtea-arch.patch \
patches/icedtea-lc_ctype.patch \
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
patches/icedtea-stroker-finish.patch \
patches/icedtea-linker-libs-order.patch \
- patches/icedtea-f2i-overflow.patch \
patches/icedtea-6761856-freetypescaler.patch \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
@@ -624,12 +612,10 @@ ICEDTEA_PATCHES = \
patches/icedtea-doc-headers.patch \
patches/openjdk/bidi-tests.patch \
patches/openjdk/annotation-tests.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-buildfixes.patch \
- patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \
- patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch
+ patches/icedtea-sparc-buildfixes.patch \
+ patches/icedtea-sparc64-linux.patch \
+ patches/icedtea-sparc-ptracefix.patch \
+ patches/icedtea-sparc-trapsfix.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -670,6 +656,15 @@ if ENABLE_NSS
if ENABLE_NSS
ICEDTEA_PATCHES += patches/icedtea-nss-config.patch \
patches/icedtea-nss-6763530.patch
+endif
+
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch
+else
+ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
+ patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
+ patches/hotspot/original/icedtea-6791168.patch \
+ patches/hotspot/original/icedtea-6793825-includedb.patch
endif
ICEDTEA_PATCHES += \
@@ -690,8 +685,9 @@ ICEDTEA_PATCHES += \
patches/icedtea-disable-cc-incompatible-sanity-checks.patch \
patches/icedtea-explicit-target-arch.patch \
patches/openjdk/6432567-debugger-socket-overflow.patch \
- patches/hotspot/$(HSBUILD)/icedtea-gcc-stack-markings.patch \
+ patches/icedtea-gcc-stack-markings.patch \
patches/icedtea-s390-serialize.patch \
+ patches/openjdk/6879689-hotspot_warning_fix.patch \
$(DISTRIBUTION_PATCHES)
stamps/extract.stamp: stamps/download.stamp
@@ -756,7 +752,7 @@ if WITH_ALT_HSBUILD
then \
$(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
chmod -R ug+w master-* ; \
- mv master-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \
+ mv master-$$($(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) \
$(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \
fi ; \
fi ;
@@ -943,7 +939,7 @@ stamps/ports-ecj.stamp: stamps/extract-e
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea-ant.patch \
patches/ecj/icedtea.patch \
- patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
+ patches/ecj/icedtea-hotspot.patch \
patches/ecj/icedtea-spp.patch \
patches/ecj/icedtea-jopt.patch
diff -r 974b05e6e033 -r 86a05a0cec75 acinclude.m4
--- a/acinclude.m4 Mon Oct 19 23:19:26 2009 +0200
+++ b/acinclude.m4 Wed Oct 21 17:00:21 2009 +0100
@@ -894,7 +894,7 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
[
- DEFAULT_BUILD="original"
+ DEFAULT_BUILD="default"
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use)],
@@ -902,7 +902,7 @@ AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
HSBUILD="${withval}"
],
[
- HSBUILD="${DEFAULT_BUILD}"
+ HSBUILD="original"
])
if test "x${HSBUILD}" = xyes; then
HSBUILD="${DEFAULT_BUILD}"
diff -r 974b05e6e033 -r 86a05a0cec75 hotspot.map
--- a/hotspot.map Mon Oct 19 23:19:26 2009 +0200
+++ b/hotspot.map Wed Oct 21 17:00:21 2009 +0100
@@ -1,2 +1,2 @@
-# version changeset md5sum
-default 09f7962b8b44 600284e870609a7531163bf2972c573b
+# version url changeset md5sum
+default http://hg.openjdk.java.net/hsx/hsx16/master 6bdfda9a7120 e194a7baefb2f55e21a280276a11b49a
diff -r 974b05e6e033 -r 86a05a0cec75 patches/ecj/icedtea-hotspot-original.patch
--- a/patches/ecj/icedtea-hotspot-original.patch Mon Oct 19 23:19:26 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-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 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(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
-@@ -74,8 +74,8 @@
- mkdir -p $(SA_CLASSDIR); \
- fi
-
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
-
-
diff -r 974b05e6e033 -r 86a05a0cec75 patches/ecj/icedtea-hotspot.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-hotspot.patch Wed Oct 21 17:00:21 2009 +0100
@@ -0,0 +1,48 @@
+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 @@
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(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
+@@ -74,8 +74,8 @@
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+
+
diff -r 974b05e6e033 -r 86a05a0cec75 patches/hotspot/default/icedtea-params-cast-size_t.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/default/icedtea-params-cast-size_t.patch Wed Oct 21 17:00:21 2009 +0100
@@ -0,0 +1,252 @@
+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 2009-10-02 22:16:39.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-10-20 22:59:56.000000000 +0100
+@@ -940,7 +940,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) {
+@@ -6094,7 +6094,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() &&
+@@ -6382,7 +6382,7 @@
+ return;
+ }
+ // Double capacity if possible
+- size_t new_capacity = MIN2(_capacity*2, CMSMarkStackSizeMax);
++ size_t new_capacity = MIN2((size_t) (_capacity*2), (size_t) CMSMarkStackSizeMax);
+ // 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 2009-10-20 22:57:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2009-10-20 22:59:56.000000000 +0100
+@@ -412,7 +412,7 @@
+ _regionStack(),
+ // _finger set in set_non_marking_state
+
More information about the distro-pkg-dev
mailing list