/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Sep 19 16:19:08 PDT 2010
changeset ed033548219c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ed033548219c
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Sep 19 23:00:46 2010 +0100
Support HotSpot 19.
2010-09-19 Andrew John Hughes <ahughes at redhat.com>
Support HotSpot 19.
* patches/icedtea-alpha-fixes.patch,
* patches/icedtea-gcc-suffix-hotspot.patch,
* patches/icedtea-print-lsb-release.patch,
* patches/params-cast-size_t.patch,
* patches/update-bootclasspath.patch: Split into original and
hs19 versions.
* Makefile.am: Apply some patches only when hs17 is built.
Apply different variants of above patches depending on
HotSpot build used.
* hotspot.map: Add hs19.
* patches/hotspot/hs19/alpha-fixes.patch,
* patches/hotspot/hs19/gcc-suffix.patch,
* patches/hotspot/hs19/params-cast-size_t.patch,
* patches/hotspot/hs19/print_lsb_release.patch,
* patches/hotspot/hs19/update-bootclasspath.patch: HotSpot 19
variants of patches moved above.
* patches/hotspot/original/alpha-fixes.patch,
* patches/hotspot/original/gcc-suffix.patch,
* patches/hotspot/original/params-cast-size_t.patch,
* patches/hotspot/original/print_lsb_release.patch,
* patches/hotspot/original/update-bootclasspath.patch: HotSpot
17 patches moved from patches above.
changeset 0c7a9312151e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0c7a9312151e
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Sep 19 23:04:46 2010 +0100
Revert 2713dbdb914e changes to javaws.1 installation.
2010-09-19 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Revert 2713dbdb914e changes to
javaws.1 installation.
changeset e470c7b5f2dc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e470c7b5f2dc
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 20 00:18:57 2010 +0100
Fix hotspot target to only rebuild OpenJDK.
2010-09-19 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (hotspot): Only remake the main
icedtea and icedtea-ecj targets (i.e. the OpenJDK
build) and not the additional targets from icedtea-against-
icedtea and icedtea-against-ecj.
diffstat:
18 files changed, 841 insertions(+), 444 deletions(-)
ChangeLog | 40 ++
Makefile.am | 84 ++---
hotspot.map | 1
patches/hotspot/hs19/alpha-fixes.patch | 21 +
patches/hotspot/hs19/gcc-suffix.patch | 31 ++
patches/hotspot/hs19/params-cast-size_t.patch | 264 ++++++++++++++++++
patches/hotspot/hs19/print_lsb_release.patch | 49 +++
patches/hotspot/hs19/update-bootclasspath.patch | 13
patches/hotspot/original/alpha-fixes.patch | 31 ++
patches/hotspot/original/gcc-suffix.patch | 25 +
patches/hotspot/original/params-cast-size_t.patch | 274 +++++++++++++++++++
patches/hotspot/original/print_lsb_release.patch | 48 +++
patches/hotspot/original/update-bootclasspath.patch | 13
patches/icedtea-alpha-fixes.patch | 31 --
patches/icedtea-gcc-suffix-hotspot.patch | 25 -
patches/icedtea-print-lsb-release.patch | 48 ---
patches/params-cast-size_t.patch | 274 -------------------
patches/update-bootclasspath.patch | 13
diffs (truncated from 1462 to 500 lines):
diff -r f9af7b6a08eb -r e470c7b5f2dc ChangeLog
--- a/ChangeLog Fri Sep 17 17:01:12 2010 -0400
+++ b/ChangeLog Mon Sep 20 00:18:57 2010 +0100
@@ -1,3 +1,43 @@ 2010-09-17 Deepak Bhole <dbhole at redhat.
+2010-09-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (hotspot): Only remake the main icedtea
+ and icedtea-ecj targets (i.e. the OpenJDK
+ build) and not the additional targets from
+ icedtea-against-icedtea and icedtea-against-ecj.
+
+2010-09-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Revert 2713dbdb914e changes to javaws.1
+ installation.
+
+2010-09-19 Andrew John Hughes <ahughes at redhat.com>
+
+ Support HotSpot 19.
+ * patches/icedtea-alpha-fixes.patch,
+ * patches/icedtea-gcc-suffix-hotspot.patch,
+ * patches/icedtea-print-lsb-release.patch,
+ * patches/params-cast-size_t.patch,
+ * patches/update-bootclasspath.patch:
+ Split into original and hs19 versions.
+ * Makefile.am: Apply some patches only when
+ hs17 is built. Apply different variants of
+ above patches depending on HotSpot build used.
+ * hotspot.map: Add hs19.
+ * patches/hotspot/hs19/alpha-fixes.patch,
+ * patches/hotspot/hs19/gcc-suffix.patch,
+ * patches/hotspot/hs19/params-cast-size_t.patch,
+ * patches/hotspot/hs19/print_lsb_release.patch,
+ * patches/hotspot/hs19/update-bootclasspath.patch:
+ HotSpot 19 variants of patches moved above.
+ * patches/hotspot/original/alpha-fixes.patch,
+ * patches/hotspot/original/gcc-suffix.patch,
+ * patches/hotspot/original/params-cast-size_t.patch,
+ * patches/hotspot/original/print_lsb_release.patch,
+ * patches/hotspot/original/update-bootclasspath.patch:
+ HotSpot 17 patches moved from patches above.
+
2010-09-17 Deepak Bhole <dbhole at redhat.com>
PR557: Applet opens in a separate window if tab is closed when the applet
diff -r f9af7b6a08eb -r e470c7b5f2dc Makefile.am
--- a/Makefile.am Fri Sep 17 17:01:12 2010 -0400
+++ b/Makefile.am Mon Sep 20 00:18:57 2010 +0100
@@ -198,7 +198,6 @@ ICEDTEA_FSG_PATCHES =
ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
- patches/shark_do_nothing_on_stub_frame.patch \
patches/icedtea-notice-safepoints.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
@@ -212,7 +211,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-headers.patch \
patches/icedtea-headers-hotspot.patch \
patches/icedtea-gcc-suffix.patch \
- patches/icedtea-gcc-suffix-hotspot.patch \
+ patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/memory-limits.patch \
patches/icedtea-sunsrc.patch \
@@ -221,22 +220,19 @@ ICEDTEA_PATCHES = \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-lcms.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-print-lsb-release.patch \
+ patches/hotspot/$(HSBUILD)/print_lsb_release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
patches/icedtea-freetypeversion.patch \
- patches/icedtea-shark-build.patch \
- patches/icedtea-shark-build-hotspot.patch \
patches/icedtea-nomotif-6706121.patch \
patches/icedtea-nomotif.patch \
patches/icedtea-nomotif-mtoolkit.patch \
- patches/icedtea-alpha-fixes.patch \
+ patches/hotspot/$(HSBUILD)/alpha-fixes.patch \
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-shark.patch \
patches/icedtea-arch.patch \
patches/icedtea-lc_ctype.patch \
patches/icedtea-xjc.patch \
@@ -264,18 +260,15 @@ ICEDTEA_PATCHES = \
patches/icedtea-explicit-target-arch.patch \
patches/icedtea-gcc-stack-markings.patch \
patches/icedtea-no-precompiled.patch \
- patches/icedtea-linux-separate-debuginfo.patch \
patches/icedtea-parisc.patch \
patches/icedtea-sh4-support.patch \
patches/icedtea-policy-evaluation.patch \
- patches/update-bootclasspath.patch \
+ patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \
patches/libpng.patch \
- patches/shark.patch \
patches/extensions/netx.patch \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
- patches/shark-debug-option.patch \
patches/openjdk/6678385-window_movement_crasher.patch \
patches/openjdk/6961732-negative_leading.patch \
patches/debug-dir.patch \
@@ -291,7 +284,6 @@ ICEDTEA_PATCHES = \
patches/openjdk/4356282-opentype.patch \
patches/openjdk/6954424-opentype_javadoc.patch \
patches/openjdk/6438179-systray_check.patch \
- patches/openjdk/6951319-sparc_build_fixes.patch \
patches/icedtea-too-many-args.patch \
patches/icedtea-jtreg-OpenGLContextInit.patch \
patches/openjdk/6969395-net_bugs.patch \
@@ -299,6 +291,18 @@ ICEDTEA_PATCHES = \
patches/openjdk/6638712-wildcard_types.patch \
patches/openjdk/6650759-missing_inference.patch \
patches/numa_on_early_glibc.patch
+
+if !WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+ patches/shark_do_nothing_on_stub_frame.patch \
+ patches/icedtea-shark-build.patch \
+ patches/icedtea-shark-build-hotspot.patch \
+ patches/shark.patch \
+ patches/shark-debug-option.patch \
+ patches/icedtea-shark.patch \
+ patches/icedtea-linux-separate-debuginfo.patch \
+ patches/openjdk/6951319-sparc_build_fixes.patch
+endif
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -1425,16 +1429,10 @@ stamps/add-netx.stamp: stamps/netx-dist.
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib
-if ENABLE_DOCS
- if test -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
- cp $(NETX_SRCDIR)/javaws.1 \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; \
- fi
- if test -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
- cp $(NETX_SRCDIR)/javaws.1 \
- $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
- fi
-endif
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; \
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
touch stamps/add-netx.stamp
clean-add-netx:
@@ -1444,14 +1442,8 @@ clean-add-netx:
rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
-if ENABLE_DOCS
- if test -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
- rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1; \
- fi
- if test -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
- rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1; \
- fi
-endif
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
rm -f stamps/add-netx.stamp
stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
@@ -1463,16 +1455,10 @@ stamps/add-netx-debug.stamp: stamps/netx
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
-if ENABLE_DOCS
- if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
- cp $(NETX_SRCDIR)/javaws.1 \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; \
- fi
- if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
- cp $(NETX_SRCDIR)/javaws.1 \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
- fi
-endif
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1
touch stamps/add-netx-debug.stamp
clean-add-netx-debug:
@@ -1482,14 +1468,8 @@ clean-add-netx-debug:
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
-if ENABLE_DOCS
- if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1; \
- fi
- if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1; \
- fi
-endif
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
rm -f stamps/add-netx-debug.stamp
# OpenJDK ecj Targets
@@ -1528,8 +1508,7 @@ hotspot:
hotspot:
if BOOTSTRAPPING
rm -f stamps/icedtea-ecj.stamp
- rm -f stamps/icedtea-against-ecj.stamp
- $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-ecj
+ $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-ecj
mkdir -p \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
@@ -1537,8 +1516,7 @@ if BOOTSTRAPPING
@echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
else
rm -f stamps/icedtea.stamp
- rm -f stamps/icedtea-against-icedtea.stamp
- $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-icedtea
+ $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea
mkdir -p \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
diff -r f9af7b6a08eb -r e470c7b5f2dc hotspot.map
--- a/hotspot.map Fri Sep 17 17:01:12 2010 -0400
+++ b/hotspot.map Mon Sep 20 00:18:57 2010 +0100
@@ -1,1 +1,2 @@
# version url changeset md5sum
+hs19 http://hg.openjdk.java.net/hsx/hsx19/master 0803c0f69b51 f174d20d004c5e1ad08929895dbee21c
diff -r f9af7b6a08eb -r e470c7b5f2dc patches/hotspot/hs19/alpha-fixes.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs19/alpha-fixes.patch Mon Sep 20 00:18:57 2010 +0100
@@ -0,0 +1,21 @@
+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-19 14:44:40.000000000 +0100
++++ openjdk/hotspot/agent/src/os/linux/Makefile 2010-09-19 15:34:47.064793576 +0100
+@@ -40,7 +40,7 @@
+
+ LIBS = -lthread_db
+
+-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
++CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES)
+
+ LIBSA = $(ARCH)/libsaproc.so
+
+@@ -73,7 +73,7 @@
+ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
+
+ test.o: test.c
+- $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
++ $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c
+
+ test: test.o
+ $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
diff -r f9af7b6a08eb -r e470c7b5f2dc patches/hotspot/hs19/gcc-suffix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs19/gcc-suffix.patch Mon Sep 20 00:18:57 2010 +0100
@@ -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 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 f9af7b6a08eb -r e470c7b5f2dc patches/hotspot/hs19/params-cast-size_t.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs19/params-cast-size_t.patch Mon Sep 20 00:18:57 2010 +0100
@@ -0,0 +1,264 @@
+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 2010-09-01 01:23:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2010-09-19 16:07:14.939307365 +0100
+@@ -2619,7 +2619,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 2010-09-01 01:23:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2010-09-19 16:07:14.915307286 +0100
+@@ -967,7 +967,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) {
+@@ -6191,7 +6191,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() &&
+@@ -6484,7 +6484,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 2010-09-19 15:38:16.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2010-09-19 16:07:14.915307286 +0100
+@@ -452,7 +452,7 @@
+ _regionStack(),
+ // _finger set in set_non_marking_state
+
+- _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
++ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
+ // _active_tasks set in set_non_marking_state
+ // _tasks set inside the constructor
+ _task_queues(new CMTaskQueueSet((int) _max_task_num)),
+@@ -503,7 +503,7 @@
+ SATBMarkQueueSet& satb_qs = JavaThread::satb_mark_queue_set();
+ satb_qs.set_buffer_size(G1SATBBufferSize);
+
+- int size = (int) MAX2(ParallelGCThreads, (size_t)1);
++ int size = (int) MAX2((size_t)ParallelGCThreads, (size_t)1);
+ _par_cleanup_thread_state = NEW_C_HEAP_ARRAY(ParCleanupThreadState*, size);
+ for (int i = 0 ; i < size; i++) {
+ _par_cleanup_thread_state[i] = new ParCleanupThreadState;
+@@ -562,7 +562,7 @@
+ _sleep_factor = sleep_factor;
+ _marking_task_overhead = marking_task_overhead;
+ } else {
+- _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
++ _parallel_marking_threads = MAX2((size_t)((ParallelGCThreads + 2) / 4), (size_t)1);
+ _sleep_factor = 0.0;
+ _marking_task_overhead = 1.0;
+ }
+@@ -689,7 +689,7 @@
+ }
+
+ ConcurrentMark::~ConcurrentMark() {
+- int size = (int) MAX2(ParallelGCThreads, (size_t)1);
++ int size = (int) MAX2((size_t)ParallelGCThreads, (size_t)1);
+ for (int i = 0; i < size; i++) delete _par_cleanup_thread_state[i];
+ FREE_C_HEAP_ARRAY(ParCleanupThreadState*,
+ _par_cleanup_thread_state);
+@@ -1781,7 +1781,7 @@
+ if (has_aborted()) return;
+
+ int first = 0;
+- int last = (int)MAX2(ParallelGCThreads, (size_t)1);
++ int last = (int)MAX2((size_t)ParallelGCThreads, (size_t)1);
+ for (int t = 0; t < last; t++) {
+ UncleanRegionList* list = &_par_cleanup_thread_state[t]->list;
+ assert(list->well_formed(), "Inv");
+@@ -3281,7 +3281,7 @@
+ // of things to do) or totally (at the very end).
+ size_t target_size;
+ if (partially)
+- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
++ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
+ else
+ target_size = 0;
+
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2010-09-01 01:23:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2010-09-19 16:07:14.915307286 +0100
+@@ -1066,7 +1066,7 @@
+ // This can be done by either mutator threads together with the
+ // concurrent refinement threads or GC threads.
+ int HeapRegionRemSet::num_par_rem_sets() {
+- return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
++ return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
+ }
+
+ HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2010-09-01 01:23:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2010-09-19 16:07:14.915307286 +0100
+@@ -864,8 +864,8 @@
+ void PSParallelCompact::initialize_dead_wood_limiter()
+ {
+ const size_t max = 100;
+- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
+- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
++ _dwl_mean = double(MIN2((size_t) ParallelOldDeadWoodLimiterMean, max)) / 100.0;
++ _dwl_std_dev = double(MIN2((size_t) ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
+ _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
+ DEBUG_ONLY(_dwl_initialized = true;)
+ _dwl_adjustment = normal_distribution(1.0);
+diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2010-09-01 01:23:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2010-09-19 16:07:14.915307286 +0100
+@@ -63,7 +63,7 @@
+ _last_used = current_live;
+
+ // We have different alignment constraints than the rest of the heap.
+- const size_t alignment = MAX2(MinPermHeapExpansion,
++ const size_t alignment = MAX2((size_t) MinPermHeapExpansion,
+ virtual_space()->alignment());
+
+ // Compute the desired size:
+diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2010-09-01 01:23:45.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2010-09-19 16:07:14.939307365 +0100
+@@ -297,7 +297,7 @@
+ // yield a size that is too small) and bound it by MaxNewSize above.
+ // Ergonomics plays here by previously calculating the desired
+ // NewSize and MaxNewSize.
+- max_new_size = MIN2(MAX2(max_new_size, NewSize), MaxNewSize);
++ max_new_size = MIN2(MAX2(max_new_size, (size_t)NewSize), (size_t)MaxNewSize);
+ }
+ assert(max_new_size > 0, "All paths should set max_new_size");
+
+@@ -324,7 +324,7 @@
+ // generally small compared to the NewRatio calculation.
+ _min_gen0_size = NewSize;
+ desired_new_size = NewSize;
+- max_new_size = MAX2(max_new_size, NewSize);
++ max_new_size = MAX2(max_new_size, (size_t) NewSize);
+ } else {
+ // For the case where NewSize is the default, use NewRatio
+ // to size the minimum and initial generation sizes.
+@@ -332,10 +332,10 @@
+ // NewRatio is overly large, the resulting sizes can be too
+ // small.
+ _min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
+- NewSize);
++ (size_t) NewSize);
+ desired_new_size =
+ MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),
+- NewSize);
++ (size_t) NewSize);
+ }
+
+ assert(_min_gen0_size > 0, "Sanity check");
+@@ -390,14 +390,14 @@
+ // Adjust gen0 down to accomodate OldSize
+ *gen0_size_ptr = heap_size - min_gen0_size;
+ *gen0_size_ptr =
+- MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
++ MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),
+ min_alignment());
+ assert(*gen0_size_ptr > 0, "Min gen0 is too large");
+ result = true;
+ } else {
+ *gen1_size_ptr = heap_size - *gen0_size_ptr;
+ *gen1_size_ptr =
+- MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),
++ MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),
+ min_alignment());
+ }
+ }
+@@ -421,7 +421,7 @@
+ // for setting the gen1 maximum.
+ _max_gen1_size = max_heap_byte_size() - _max_gen0_size;
+ _max_gen1_size =
+- MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),
++ MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),
More information about the distro-pkg-dev
mailing list