--- a/ChangeLog	Thu Dec 24 17:46:14 2015 +0000
+++ b/ChangeLog	Fri Jan 29 14:18:11 2016 +0000
@@ -1,3 +1,29 @@
+2016-01-28  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	Bump to icedtea-3.0.0pre08.
+	* patches/pr2777.patch: Removed; upstream.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(NASHORN_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(NASHORN_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Remove pr2777 patch.
+	* NEWS: Updated.
+	* configure.ac: Bump to 3.0.0pre08.
+	* fsg.sh.in: Remove deletions of files which have
+	now been deleted upstream (PR2767)
+	* hotspot.map.in: Update to icedtea-3.0.0pre08 tag.
+
 2015-12-23  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:

--- a/Makefile.am	Thu Dec 24 17:46:14 2015 +0000
+++ b/Makefile.am	Fri Jan 29 14:18:11 2016 +0000
@@ -4,21 +4,21 @@
 BUILD_VERSION = b24
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 7418bb690047
-JAXP_CHANGESET = c08ba71fef66
-JAXWS_CHANGESET = 2012603e0e90
-JDK_CHANGESET = c4b25140f059
-LANGTOOLS_CHANGESET = 3c76eafe1b70
-OPENJDK_CHANGESET = 4b05cb9c5a4c
-NASHORN_CHANGESET = fd478ce27023
+CORBA_CHANGESET = ebc2780ebeb3
+JAXP_CHANGESET = ac52a8eed353
+JAXWS_CHANGESET = 26a1fdce80b7
+JDK_CHANGESET = 809d98eeda49
+LANGTOOLS_CHANGESET = 0d3479e0bac6
+OPENJDK_CHANGESET = f0635543beb3
+NASHORN_CHANGESET = 7babac6e7ecf
 
-CORBA_SHA256SUM = e47d271bd2d0490d07d194480ae3943bc2617dc260b6cc2ef080697f588bbc62
-JAXP_SHA256SUM = ce0e1a6c850420735233e06667b32d32f91051ae4abb57f76c86343fbe3aa7d3
-JAXWS_SHA256SUM = 3b30942316cc58b2f461587f5032841d072cc31c1c4f4c62c60b9cc49713065e
-JDK_SHA256SUM = 8136f803b78577a35be6e481733b327831069723f1828f0c964c6d8689f459cc
-LANGTOOLS_SHA256SUM = d48f5de5ede27c075def8c79d2e3668223def1da671cc5b8a69b80fc7aeb2207
-OPENJDK_SHA256SUM = 12d6348124c133ed43cc1ac0dad0ce3eafb2e42947c36cc87df2f5163674a805
-NASHORN_SHA256SUM = e3a6e093e574a6a9d2cefc25184510c023ad4bd65fbb060085e969e23050a515
+CORBA_SHA256SUM = 330c609920179ee0c73fd40140c915bf1497ee00742d223d721babeb48d4ec66
+JAXP_SHA256SUM = e6771d28027925157e0f3573c7f2b58607d7ae4bb0fd77a6d38f154e7008c09b
+JAXWS_SHA256SUM = be44c6810e3b8dc8de0ca62dce7111016bb035e9b334af40cffdd9c27cca1ec2
+JDK_SHA256SUM = 55d51096e311e743533b0ccf7974e20588c1df08ac790edf226f06d49a699e25
+LANGTOOLS_SHA256SUM = 536db72b9440ef1ce11d1f87b15a2052a3f362fab04d5bedcd185839e742db86
+OPENJDK_SHA256SUM = fa45e6d4b7b2f114cb1d7388ab57f419b6f733e7be744cac4def586959da64b8
+NASHORN_SHA256SUM = b2509a50adfa4b29c0ae6e8c5b601fc2a76e9cc63da1d34443c6e0bf11a7c150
 
 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
 HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
@@ -230,8 +230,7 @@
 	patches/memory-limits.patch \
 	patches/override-redirect-metacity.patch \
 	patches/rh1022017.patch \
-	patches/disable-intree-ec.patch \
-	patches/pr2777.patch
+	patches/disable-intree-ec.patch
 
 # Conditional patches
 

--- a/NEWS	Thu Dec 24 17:46:14 2015 +0000
+++ b/NEWS	Fri Jan 29 14:18:11 2016 +0000
@@ -27,6 +27,7 @@
   - S8087218, PR2740: Constant fold loads from final instance fields in VM anonymous classes
   - S8139932, PR2739: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg]
   - S8140483, PR2740: Atomic*FieldUpdaters final fields should be trusted
+  - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux
 * Bug fixes
   - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
   - PR94: empty install target in Makefile.am
@@ -44,6 +45,7 @@
   - PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative
   - PR1364: Replace hgforest support
   - PR1367: Support using the system installation of LCMS
+  - PR1368: Ensure debug data is available for all libraries and binaries without redundant files
   - PR1369: Remove outdated bootstrap configure tests or make them fail on error
   - PR1377: Forwardport javac detection / usability test from IcedTea 2.x
   - PR1379: Add build support for Zero AArch64
@@ -71,11 +73,13 @@
   - PR1979: Support using the system installation of libjpeg
   - PR1980: Support using the system installation of giflib
   - PR1981: Support using the system installation of libpng
+  - PR1983: Support using the system installation of NSS with the SunEC provider
   - PR1994: make dist broken
   - PR2001: Synchronise HEAD tarball paths with release branch paths
   - PR2066: Unset OS before running OpenJDK build
   - PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
   - PR2126: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
+  - PR2127: SunEC provider crashes when built using system NSS
   - PR2199: Support giflib 5.1.0
   - PR2212: DGifCloseFile call should check the return value, not the error code, for failure
   - PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc.
@@ -83,6 +87,7 @@
   - PR2248: HotSpot tarball fails verification after download
   - PR2256: Add SystemTap tests
   - PR2257: clean-extract-nashorn rule is never run
+  - PR2321: Checksum of policy JAR files changes on every build
   - PR2329: jamvm parallel unpack failures
   - PR2339: Fail early if there is no native HotSpot JIT & all other options are disabled
   - PR2348: Avoid following symlinks for CACAO and JamVM patches
@@ -112,6 +117,7 @@
   - PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
   - PR2454: install-data-local needs to check that classes.jsa actually exists
   - PR2456: Installation path for hotspot_gc.stp is wrong, due to changed j2sdk-image location
+  - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold
   - PR2511: Reset success following calls in LayoutManager.cpp
   - PR2631: jvm.cfg missing for ppc64le
   - PR2633: s390 builds still fail as BUILD_NUM_BITS is never set
@@ -121,7 +127,9 @@
   - PR2738: java.lang.UnsatisfiedLinkError: no javalcms in java.library.path
   - PR2743: Remove bad AArch64 merge fragment
   - PR2759: LCMS library should be named javalcms, not lcms, to avoid potential conflicts with the system library
+  - PR2767: Remove remaining rogue binaries from OpenJDK tree
   - PR2777: Fix MAX/MIN template usage on s390
+  - PR2815: Race condition in SunEC provider with system NSS
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck

--- a/configure.ac	Thu Dec 24 17:46:14 2015 +0000
+++ b/configure.ac	Fri Jan 29 14:18:11 2016 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.0.0pre07], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.0.0pre08], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])

--- a/fsg.sh.in	Thu Dec 24 17:46:14 2015 +0000
+++ b/fsg.sh.in	Fri Jan 29 14:18:11 2016 +0000
@@ -5,24 +5,6 @@
 # PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
 # Sx denotes bug x in the Sun/Oracle bug database (https://bugs.openjdk.java.net/browse/JDK-X)
 
-# PR146/S6713083
-# Remove binaries
-rm -vf \
-  openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher \
-  openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher \
-  openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-amd64/launcher
-
-rm -vf \
-  openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so
-
-# BEGIN Debian/Ubuntu additions
-
-# binary files
-rm -vf \
-  openjdk/jdk/test/sun/net/idn/*.spp
-
-# END Debian/Ubuntu additions
-
 echo "Removing support for proprietary SNMP plug"
 rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
 rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp

--- a/hotspot.map.in	Thu Dec 24 17:46:14 2015 +0000
+++ b/hotspot.map.in	Fri Jan 29 14:18:11 2016 +0000
@@ -1,2 +1,2 @@
 # version url changeset md5sum
-default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ ddebea156752 0dd59345896a6b0f9b89681494a86de5471ded4e48bd81738fdd143c12918876
+default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ c313c4782bb3 c876cd97bca74e2970161688eb3e388675ebce3ebc4a34bedfb6bec3bb8e9cab

--- a/patches/pr2777.patch	Thu Dec 24 17:46:14 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,290 +0,0 @@
-diff -Nru openjdk/hotspot.old/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2015-12-23 16:03:01.880881131 -0500
-@@ -2659,7 +2659,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/hotspot.old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2015-12-23 16:10:30.880805198 -0500
-@@ -963,7 +963,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");
--    size_t expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes);
-+    size_t expand_bytes = MAX2(desired_capacity - capacity(), (size_t) MinHeapDeltaBytes);
-     if (PrintGCDetails && Verbose) {
-       size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
-       gclog_or_tty->print_cr("\nFrom compute_new_size: ");
-@@ -6589,7 +6589,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() &&
-@@ -6887,7 +6887,7 @@
-     return;
-   }
-   // Double capacity if possible
--  size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax);
-+  size_t new_capacity = MIN2(_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/hotspot.old/src/share/vm/gc_implementation/g1/concurrentMark.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2015-12-23 16:05:54.970862212 -0500
-@@ -3903,7 +3903,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/hotspot.old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-12-23 16:14:44.630756825 -0500
-@@ -1726,7 +1726,7 @@
- 
-   verify_region_sets_optional();
- 
--  size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
-+  size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t) MinHeapDeltaBytes);
-   ergo_verbose1(ErgoHeapSizing,
-                 "attempt heap expansion",
-                 ergo_format_reason("allocation request failed")
-diff -Nru openjdk/hotspot.old/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp	2015-12-23 16:17:52.080706118 -0500
-@@ -89,7 +89,7 @@
-   void pretouch_internal(size_t start_page, size_t end_page);
- 
-   // Returns the index of the page which contains the given address.
--  uintptr_t  addr_to_page_index(char* addr) const;
-+  size_t  addr_to_page_index(char* addr) const;
-   // Returns the address of the given page index.
-   char*  page_start(size_t index) const;
- 
-diff -Nru openjdk/hotspot.old/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2015-12-23 16:20:31.140706118 -0500
-@@ -38,7 +38,7 @@
-   _cancel(false),
-   _empty(true),
-   _dropped(0) {
--  _nqueues = MAX2(ParallelGCThreads, (size_t)1);
-+  _nqueues = MAX2((size_t) ParallelGCThreads, (size_t)1);
-   _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC);
-   for (size_t i = 0; i < _nqueues; i++) {
-     new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size);
-diff -Nru openjdk/hotspot.old/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2015-12-23 16:21:21.140696134 -0500
-@@ -110,7 +110,7 @@
- };
- 
- G1StringDedupEntryCache::G1StringDedupEntryCache() {
--  _nlists = MAX2(ParallelGCThreads, (size_t)1);
-+  _nlists = MAX2((size_t) ParallelGCThreads, (size_t)1);
-   _lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists);
- }
- 
-diff -Nru openjdk/hotspot.old/src/share/vm/gc_implementation/g1/heapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/g1/heapRegion.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2015-12-23 16:24:16.160655121 -0500
-@@ -108,7 +108,7 @@
-   uintx region_size = G1HeapRegionSize;
-   if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
-     size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
--    region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(),
-+    region_size = MAX2((uintx) (average_heap_size / HeapRegionBounds::target_number()),
-                        (uintx) HeapRegionBounds::min_size());
-   }
- 
-diff -Nru openjdk/hotspot.old/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2015-12-23 16:36:19.840421459 -0500
-@@ -920,8 +920,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/hotspot.old/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
---- openjdk/hotspot.old/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	2015-12-23 16:34:41.150421459 -0500
-@@ -200,7 +200,7 @@
-   const size_t num_overflow_elems = of_stack->size();
-   const size_t space_available = queue->max_elems() - queue->size();
-   const size_t num_take_elems = MIN3(space_available / 4,
--                                     ParGCDesiredObjsFromOverflowList,
-+                                     (size_t) ParGCDesiredObjsFromOverflowList,
-                                      num_overflow_elems);
-   // Transfer the most recent num_take_elems from the overflow
-   // stack to our work queue.
-diff -Nru openjdk/hotspot.old/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
---- openjdk/hotspot.old/src/share/vm/memory/collectorPolicy.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp	2015-12-23 16:01:06.870914224 -0500
-@@ -385,7 +385,7 @@
-       uintx calculated_size = NewSize + OldSize;
-       double shrink_factor = (double) MaxHeapSize / calculated_size;
-       uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
--      FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), smaller_new_size));
-+      FLAG_SET_ERGO(uintx, NewSize, MAX2((uintx) young_gen_size_lower_bound(), smaller_new_size));
-       _initial_gen0_size = NewSize;
- 
-       // OldSize is already aligned because above we aligned MaxHeapSize to
-@@ -423,7 +423,7 @@
- 
-   // Determine maximum size of gen0
- 
--  size_t max_new_size = 0;
-+  uintx max_new_size = 0;
-   if (!FLAG_IS_DEFAULT(MaxNewSize)) {
-     max_new_size = MaxNewSize;
-   } else {
-@@ -448,7 +448,7 @@
-     _initial_gen0_size = max_new_size;
-     _max_gen0_size = max_new_size;
-   } else {
--    size_t desired_new_size = 0;
-+    uintx desired_new_size = 0;
-     if (FLAG_IS_CMDLINE(NewSize)) {
-       // If NewSize is set on the command line, we must use it as
-       // the initial size and it also makes sense to use it as the
-@@ -461,7 +461,7 @@
-       // limit, but use NewRatio to calculate the initial size.
-       _min_gen0_size = NewSize;
-       desired_new_size =
--        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-+        MAX2((uintx) (scale_by_NewRatio_aligned(_initial_heap_byte_size)), NewSize);
-       max_new_size = MAX2(max_new_size, NewSize);
-     } else {
-       // For the case where NewSize is the default, use NewRatio
-@@ -469,9 +469,9 @@
-       // Use the default NewSize as the floor for these values.  If
-       // NewRatio is overly large, the resulting sizes can be too
-       // small.
--      _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), NewSize);
-+      _min_gen0_size = MAX2((uintx) (scale_by_NewRatio_aligned(_min_heap_byte_size)), NewSize);
-       desired_new_size =
--        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-+        MAX2((uintx) (scale_by_NewRatio_aligned(_initial_heap_byte_size)), NewSize);
-     }
- 
-     assert(_min_gen0_size > 0, "Sanity check");
-@@ -573,7 +573,7 @@
-   } else {
-     // It's been explicitly set on the command line.  Use the
-     // OldSize and then determine the consequences.
--    _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size);
-+    _min_gen1_size = MIN2(OldSize, (uintx) (_min_heap_byte_size - _min_gen0_size));
-     _initial_gen1_size = OldSize;
- 
-     // If the user has explicitly set an OldSize that is inconsistent
-diff -Nru openjdk/hotspot.old/src/share/vm/memory/metaspace.cpp openjdk/hotspot/src/share/vm/memory/metaspace.cpp
---- openjdk/hotspot.old/src/share/vm/memory/metaspace.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/memory/metaspace.cpp	2015-12-23 16:33:24.470421459 -0500
-@@ -1455,7 +1455,7 @@
- 
- void MetaspaceGC::post_initialize() {
-   // Reset the high-water mark once the VM initialization is done.
--  _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize);
-+  _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), (size_t) MetaspaceSize);
- }
- 
- bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
-@@ -1515,7 +1515,7 @@
-     (size_t)MIN2(min_tmp, double(max_uintx));
-   // Don't shrink less than the initial generation size
-   minimum_desired_capacity = MAX2(minimum_desired_capacity,
--                                  MetaspaceSize);
-+                                  (size_t) MetaspaceSize);
- 
-   if (PrintGCDetails && Verbose) {
-     gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
-@@ -1573,7 +1573,7 @@
-     const double max_tmp = used_after_gc / minimum_used_percentage;
-     size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
-     maximum_desired_capacity = MAX2(maximum_desired_capacity,
--                                    MetaspaceSize);
-+                                    (size_t) MetaspaceSize);
-     if (PrintGCDetails && Verbose) {
-       gclog_or_tty->print_cr("  "
-                              "  maximum_free_percentage: %6.2f"
-@@ -3285,7 +3285,7 @@
-     // on the medium chunk list.   The next chunk will be small and progress
-     // from there.  This size calculated by -version.
-     _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
--                                       (CompressedClassSpaceSize/BytesPerWord)*2);
-+					(size_t) ((CompressedClassSpaceSize/BytesPerWord)*2));
-     _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
-     // Arbitrarily set the initial virtual space to a multiple
-     // of the boot class loader size.
-diff -Nru openjdk/hotspot.old/src/share/vm/oops/objArrayKlass.inline.hpp openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
---- openjdk/hotspot.old/src/share/vm/oops/objArrayKlass.inline.hpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp	2015-12-23 16:26:32.200644827 -0500
-@@ -48,7 +48,7 @@
-   const size_t beg_index = size_t(index);
-   assert(beg_index < len || len == 0, "index too large");
- 
--  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+  const size_t stride = MIN2(len - beg_index, (size_t) ObjArrayMarkingStride);
-   const size_t end_index = beg_index + stride;
-   T* const base = (T*)a->base();
-   T* const beg = base + beg_index;
-@@ -82,7 +82,7 @@
-   const size_t beg_index = size_t(index);
-   assert(beg_index < len || len == 0, "index too large");
- 
--  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+  const size_t stride = MIN2(len - beg_index, (size_t) ObjArrayMarkingStride);
-   const size_t end_index = beg_index + stride;
-   T* const base = (T*)a->base();
-   T* const beg = base + beg_index;
-diff -Nru openjdk/hotspot.old/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk/hotspot.old/src/share/vm/runtime/arguments.cpp	2015-11-17 22:43:28.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2015-12-23 15:40:25.731137339 -0500
-@@ -1264,7 +1264,7 @@
-     (ParallelGCThreads == 0 ? 1 : ParallelGCThreads);
-   const size_t preferred_max_new_size_unaligned =
-     MIN2(max_heap/(NewRatio+1), ScaleForWordSize(young_gen_per_worker * parallel_gc_threads));
--  size_t preferred_max_new_size =
-+  uintx preferred_max_new_size = (uintx)
-     align_size_up(preferred_max_new_size_unaligned, os::vm_page_size());
- 
-   // Unless explicitly requested otherwise, size young gen
-@@ -1295,7 +1295,7 @@
-            " max_heap: " SIZE_FORMAT,
-            min_heap_size(), InitialHeapSize, max_heap);
-     }
--    size_t min_new = preferred_max_new_size;
-+    uintx min_new = preferred_max_new_size;
-     if (FLAG_IS_CMDLINE(NewSize)) {
-       min_new = NewSize;
-     }
-@@ -1314,7 +1314,7 @@
-       // so it's NewRatio x of NewSize.
-       if (FLAG_IS_DEFAULT(OldSize)) {
-         if (max_heap > NewSize) {
--          FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
-+          FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, (uintx) (max_heap - NewSize)));
-           if (PrintGCDetails && Verbose) {
-             // Too early to use gclog_or_tty
-             tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);