From 7e64b7eed0b62a8012fb870ddaeac16c789c3d30e8999bc958aaa17c3d2f5c7b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 29 Jan 2017 20:42:35 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=199

---
 corba.tar.xz                  |   4 +-
 hotspot.tar.xz                |   4 +-
 icedtea-3.2.0.tar.xz          |   3 -
 icedtea-3.3.0.tar.xz          |   3 +
 java-1_8_0-openjdk-gcc6.patch | 317 ++++++++++++++++------------------
 java-1_8_0-openjdk.spec       |   6 +-
 jaxp.tar.xz                   |   4 +-
 jaxws.tar.xz                  |   4 +-
 jdk.tar.xz                    |   4 +-
 langtools.tar.xz              |   4 +-
 nashorn.tar.xz                |   4 +-
 openjdk.tar.xz                |   4 +-
 12 files changed, 170 insertions(+), 191 deletions(-)
 delete mode 100644 icedtea-3.2.0.tar.xz
 create mode 100644 icedtea-3.3.0.tar.xz

diff --git a/corba.tar.xz b/corba.tar.xz
index 5a4c2b9..9f507ef 100644
--- a/corba.tar.xz
+++ b/corba.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:902607987e26c67489f01fe8cf693fbbbd5850f3b9b06ff12af5486b75822387
-size 939832
+oid sha256:19492bdd85166ce55d0f85f96e1d3d0b21e61f4604349ea0b94f6a0aa1388b61
+size 940804
diff --git a/hotspot.tar.xz b/hotspot.tar.xz
index 85b3921..1017e85 100644
--- a/hotspot.tar.xz
+++ b/hotspot.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9dd74ff7ac16b6104410c7c331f39e96fe50940e4023201b1a2898a8314e1fbf
-size 6809636
+oid sha256:280f706bb0aaada0903e9e907811ea12bc1c216fdaeb2694910f3a99217f6e89
+size 6813884
diff --git a/icedtea-3.2.0.tar.xz b/icedtea-3.2.0.tar.xz
deleted file mode 100644
index ad1cf95..0000000
--- a/icedtea-3.2.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2a197734cc1f820f14a6ba0aef0f198c24c77e9f026d14ddf185b684b178f80
-size 1450484
diff --git a/icedtea-3.3.0.tar.xz b/icedtea-3.3.0.tar.xz
new file mode 100644
index 0000000..12f57e7
--- /dev/null
+++ b/icedtea-3.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b764ff09674f9139f94dfe9df8f6393ed55af149c7bb1033fbf119f68cea750b
+size 1453792
diff --git a/java-1_8_0-openjdk-gcc6.patch b/java-1_8_0-openjdk-gcc6.patch
index b3667c1..292f85d 100644
--- a/java-1_8_0-openjdk-gcc6.patch
+++ b/java-1_8_0-openjdk-gcc6.patch
@@ -1,5 +1,5 @@
---- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2016-11-09 11:14:21.439079322 +0100
+--- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2017-01-29 21:33:14.341347702 +0100
 @@ -373,7 +373,7 @@
  
    void print_on(outputStream* st) const {
@@ -9,8 +9,8 @@
      st->print(" -> ");
      bool printed = false;
      if (method() != NULL) {
---- openjdk/hotspot/src/share/vm/code/dependencies.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/code/dependencies.hpp	2016-11-09 11:14:21.439079322 +0100
+--- openjdk/hotspot/src/share/vm/code/dependencies.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/dependencies.hpp	2017-01-29 21:33:14.341347702 +0100
 @@ -166,7 +166,7 @@
      LG2_TYPE_LIMIT = 4,  // assert(TYPE_LIMIT <= (1<<LG2_TYPE_LIMIT))
  
@@ -20,8 +20,8 @@
  
      non_klass_types     = (1 << call_site_target_value),
      klass_types         = all_types & ~non_klass_types,
---- openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2016-11-09 11:14:21.439079322 +0100
+--- openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2017-01-29 21:33:14.341347702 +0100
 @@ -186,7 +186,7 @@
  void ImplicitExceptionTable::print(address base) const {
    tty->print("{");
@@ -31,8 +31,8 @@
    tty->print_cr("}");
  }
  
---- openjdk/hotspot/src/share/vm/code/nmethod.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2016-11-09 11:14:21.439079322 +0100
+--- openjdk/hotspot/src/share/vm/code/nmethod.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2017-01-29 21:33:14.341347702 +0100
 @@ -2721,7 +2721,7 @@
        _nm->print_nmethod(true);
        _ok = false;
@@ -60,8 +60,8 @@
      tty->print(" for method " INTPTR_FORMAT , (address)method());
      tty->print(" { ");
      if (is_in_use())      tty->print("in_use ");
---- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2016-11-09 11:14:21.439079322 +0100
+--- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2017-01-29 21:33:14.341347702 +0100
 @@ -203,7 +203,7 @@
    }
  
@@ -71,8 +71,8 @@
          nm->compile_id(), nm->is_osr_method() ? "%" : "",
          p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
    }
---- openjdk/hotspot/src/share/vm/compiler/disassembler.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/compiler/disassembler.cpp	2016-11-09 11:14:21.439079322 +0100
+--- openjdk/hotspot/src/share/vm/compiler/disassembler.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/compiler/disassembler.cpp	2017-01-29 21:33:14.341347702 +0100
 @@ -63,7 +63,7 @@
  Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
  Disassembler::decode_func Disassembler::_decode_instructions = NULL;
@@ -82,8 +82,8 @@
  static const char decode_instructions_virtual_name[] = "decode_instructions_virtual";
  static const char decode_instructions_name[] = "decode_instructions";
  static bool use_new_version = true;
---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2016-11-09 11:14:21.443079232 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2017-01-29 21:33:14.345347611 +0100
 @@ -844,18 +844,18 @@
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    if (PrintGCDetails) {
@@ -315,8 +315,8 @@
                     freeFinger(), pointer_delta(addr, freeFinger()),
                     lastFreeRangeCoalesced());
        }
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp	2016-11-09 11:14:21.443079232 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp	2017-01-29 21:33:14.345347611 +0100
 @@ -92,7 +92,7 @@
      regions_at_put(_curr_index, NULL);
      assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes,
@@ -326,8 +326,8 @@
                     hr->reclaimable_bytes(), _remaining_reclaimable_bytes));
      _remaining_reclaimable_bytes -= hr->reclaimable_bytes();
      _curr_index += 1;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2016-11-09 11:14:21.443079232 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2017-01-29 21:33:14.345347611 +0100
 @@ -284,7 +284,7 @@
      if (PrintGCDetails && Verbose) {
        // Failed to double capacity, continue;
@@ -614,8 +614,8 @@
  
  G1PrintRegionLivenessInfoClosure::
  G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	2017-01-29 21:33:14.349347519 +0100
 @@ -196,8 +196,8 @@
    assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize),      \
           "outside underlying space?");                                         \
@@ -645,8 +645,8 @@
                   word_size * HeapWordSize, hr->capacity(),
                   HR_FORMAT_PARAMS(hr)));
  
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp	2017-01-29 21:33:14.349347519 +0100
 @@ -73,7 +73,7 @@
  
     void decrease_used(size_t bytes) {
@@ -656,8 +656,8 @@
                  _summary_bytes_used, bytes));
       _summary_bytes_used -= bytes;
     }
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp	2017-01-29 21:33:14.349347519 +0100
 @@ -140,7 +140,7 @@
  }
  
@@ -676,8 +676,8 @@
                       word_size, result);
        } else if (word_size != 0) {
          jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size);
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	2017-01-29 21:33:14.349347519 +0100
 @@ -385,11 +385,11 @@
      HeapWord* card_addr = _array->address_for_index(card);
      HeapWord* block_start = block_start_const(card_addr);
@@ -710,8 +710,8 @@
                    i, _array->address_for_index(i),
                    (uint) _array->offset_array(i));
    }
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2017-01-29 21:33:14.349347519 +0100
 @@ -49,10 +49,10 @@
  
  #define check_index(index, msg)                                                \
@@ -725,8 +725,8 @@
                   " (%u) is not in committed area.",                            \
                   (index),                                                      \
                   p2i(address_for_index_raw(index)),                            \
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2017-01-29 21:33:14.349347519 +0100
 @@ -44,7 +44,7 @@
  void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
    if (has_count_table()) {
@@ -745,8 +745,8 @@
                     card_num, _reserved_max_card_num));
      count = (uint) _card_counts[card_num];
      if (count < G1ConcRSHotCardLimit) {
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2017-01-29 21:33:14.349347519 +0100
 @@ -91,7 +91,7 @@
  
    jbyte* card_num_2_ptr(size_t card_num) {
@@ -756,8 +756,8 @@
      return (jbyte*) (_ct_bot + card_num);
    }
  
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2016-11-09 11:14:21.447079143 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2017-01-29 21:33:14.349347519 +0100
 @@ -230,7 +230,7 @@
    HeapRegion* last = NULL;
    while (curr != NULL) {
@@ -986,8 +986,8 @@
                       _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
  
        hr->remove_strong_code_root(_nm);
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp	2017-01-29 21:33:14.353347428 +0100
 @@ -81,7 +81,7 @@
  
  inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
@@ -1006,8 +1006,8 @@
            p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
    return _hrm.addr_to_region((HeapWord*) addr);
  }
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -199,7 +199,7 @@
    const size_t region_size = HeapRegion::GrainWords;
    if (YoungPLABSize > region_size || OldPLABSize > region_size) {
@@ -1041,8 +1041,8 @@
      EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
      EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
      EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2017-01-29 21:33:14.353347428 +0100
 @@ -121,15 +121,15 @@
  // Single parameter format strings
  #define ergo_format_str(_name_)      ", " _name_ ": %s"
@@ -1062,8 +1062,8 @@
  
  // Generates the format string
  #define ergo_format(_extra_format_)                           \
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -332,7 +332,7 @@
  }
  
@@ -1082,8 +1082,8 @@
      }
    }
  
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -84,18 +84,18 @@
  
    if (type_str != NULL) {
@@ -1121,8 +1121,8 @@
 -  gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num);
 +  gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num);
  }
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	2017-01-29 21:33:14.353347428 +0100
 @@ -118,7 +118,7 @@
    oop obj = oopDesc::load_decode_heap_oop(p);
    if (_cm->verbose_high()) {
@@ -1132,8 +1132,8 @@
                             _task->worker_id(), p2i(p), p2i((void*) obj));
    }
    _task->deal_with_reference(obj);
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -442,7 +442,7 @@
  bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
                             bool check_for_refs_into_cset) {
@@ -1143,15 +1143,17 @@
                   p2i(card_ptr),
                   _ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
                   _ct_bs->addr_for(card_ptr),
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	2016-11-09 11:14:21.451079053 +0100
-@@ -187,22 +187,22 @@
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	2017-01-29 21:36:52.804380756 +0100
+@@ -183,26 +183,26 @@
    size_t code_root_elems() const { return _code_root_elems; }
  
    void print_rs_mem_info_on(outputStream * out, size_t total) {
--    out->print_cr("    "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
-+    out->print_cr("    " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions",
-         round_to_K(rs_mem_size()), rs_mem_size_percent_of(total), amount(), _name);
+-    out->print_cr("    "SIZE_FORMAT_W(8) "%s (%5.1f%%) by "SIZE_FORMAT" %s regions",
++    out->print_cr("    " SIZE_FORMAT_W(8) "%s (%5.1f%%) by " SIZE_FORMAT " %s regions",
+         byte_size_in_proper_unit(rs_mem_size()),
+         proper_unit_for_byte_size(rs_mem_size()),
+         rs_mem_size_percent_of(total), amount(), _name);
    }
  
    void print_cards_occupied_info_on(outputStream * out, size_t total) {
@@ -1161,9 +1163,11 @@
    }
  
    void print_code_root_mem_info_on(outputStream * out, size_t total) {
--    out->print_cr("    "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
-+    out->print_cr("    " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions",
-         round_to_K(code_root_mem_size()), code_root_mem_size_percent_of(total), amount(), _name);
+-    out->print_cr("    "SIZE_FORMAT_W(8) "%s (%5.1f%%) by "SIZE_FORMAT" %s regions",
++    out->print_cr("    " SIZE_FORMAT_W(8) "%s (%5.1f%%) by " SIZE_FORMAT " %s regions",
+         byte_size_in_proper_unit(code_root_mem_size()),
+         proper_unit_for_byte_size(code_root_mem_size()),
+         code_root_mem_size_percent_of(total), amount(), _name);
    }
  
    void print_code_root_elems_info_on(outputStream * out, size_t total) {
@@ -1172,52 +1176,27 @@
          code_root_elems(), code_root_elems_percent_of(total), amount(), _name);
    }
  };
-@@ -280,19 +280,19 @@
-     RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
- 
-     out->print_cr("\n Current rem set statistics");
--    out->print_cr("  Total per region rem sets sizes = "SIZE_FORMAT"K."
--                  " Max = "SIZE_FORMAT"K.",
-+    out->print_cr("  Total per region rem sets sizes = " SIZE_FORMAT "K."
-+                  " Max = " SIZE_FORMAT "K.",
-                   round_to_K(total_rs_mem_sz()), round_to_K(max_rs_mem_sz()));
-     for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
-       (*current)->print_rs_mem_info_on(out, total_rs_mem_sz());
-     }
- 
--    out->print_cr("   Static structures = "SIZE_FORMAT"K,"
--                  " free_lists = "SIZE_FORMAT"K.",
-+    out->print_cr("   Static structures = " SIZE_FORMAT "K,"
-+                  " free_lists = " SIZE_FORMAT "K.",
-                   round_to_K(HeapRegionRemSet::static_mem_size()),
-                   round_to_K(HeapRegionRemSet::fl_mem_size()));
+@@ -298,7 +298,7 @@
+                   byte_size_in_proper_unit(HeapRegionRemSet::fl_mem_size()),
+                   proper_unit_for_byte_size(HeapRegionRemSet::fl_mem_size()));
  
 -    out->print_cr("    "SIZE_FORMAT" occupied cards represented.",
 +    out->print_cr("    " SIZE_FORMAT " occupied cards represented.",
                    total_cards_occupied());
      for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
        (*current)->print_cards_occupied_info_on(out, total_cards_occupied());
-@@ -300,30 +300,30 @@
+@@ -306,8 +306,8 @@
  
      // Largest sized rem set region statistics
      HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
 -    out->print_cr("    Region with largest rem set = "HR_FORMAT", "
--                  "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
+-                  "size = "SIZE_FORMAT "%s, occupied = "SIZE_FORMAT "%s.",
 +    out->print_cr("    Region with largest rem set = " HR_FORMAT ", "
-+                  "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.",
++                  "size = " SIZE_FORMAT "%s, occupied = " SIZE_FORMAT "%s.",
                    HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
-                   round_to_K(rem_set->mem_size()),
-                   round_to_K(rem_set->occupied()));
- 
-     // Strong code root statistics
-     HeapRegionRemSet* max_code_root_rem_set = max_code_root_mem_sz_region()->rem_set();
--    out->print_cr("  Total heap region code root sets sizes = "SIZE_FORMAT"K."
--                  "  Max = "SIZE_FORMAT"K.",
-+    out->print_cr("  Total heap region code root sets sizes = " SIZE_FORMAT "K."
-+                  "  Max = " SIZE_FORMAT "K.",
-                   round_to_K(total_code_root_mem_sz()),
-                   round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()));
-     for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
+                   byte_size_in_proper_unit(rem_set->mem_size()),
+                   proper_unit_for_byte_size(rem_set->mem_size()),
+@@ -326,14 +326,14 @@
        (*current)->print_code_root_mem_info_on(out, total_code_root_mem_sz());
      }
  
@@ -1229,13 +1208,13 @@
      }
  
 -    out->print_cr("    Region with largest amount of code roots = "HR_FORMAT", "
--                  "size = "SIZE_FORMAT "K, num_elems = "SIZE_FORMAT".",
+-                  "size = "SIZE_FORMAT "%s, num_elems = "SIZE_FORMAT".",
 +    out->print_cr("    Region with largest amount of code roots = " HR_FORMAT ", "
-+                  "size = " SIZE_FORMAT "K, num_elems = " SIZE_FORMAT ".",
++                  "size = " SIZE_FORMAT "%s, num_elems = " SIZE_FORMAT ".",
                    HR_FORMAT_PARAMS(max_code_root_mem_sz_region()),
-                   round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()),
-                   round_to_K(max_code_root_rem_set->strong_code_roots_list_length()));
-@@ -332,16 +332,16 @@
+                   byte_size_in_proper_unit(max_code_root_rem_set->strong_code_roots_mem_size()),
+                   proper_unit_for_byte_size(max_code_root_rem_set->strong_code_roots_mem_size()),
+@@ -344,16 +344,16 @@
  
  void G1RemSetSummary::print_on(outputStream* out) {
    out->print_cr("\n Recent concurrent refinement statistics");
@@ -1257,8 +1236,8 @@
    out->print_cr("  Concurrent RS threads times (s)");
    out->print("     ");
    for (uint i = 0; i < _num_vtimes; i++) {
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -151,7 +151,7 @@
  void G1StringDedupQueue::print_statistics(outputStream* st) {
    st->print_cr(
@@ -1268,8 +1247,8 @@
  }
  
  void G1StringDedupQueue::verify() {
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2016-11-09 11:14:21.451079053 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -80,8 +80,8 @@
    st->stamp(PrintGCTimeStamps);
    st->print_cr(
@@ -1314,9 +1293,9 @@
      stat._inspected,
      stat._skipped, skipped_percent,
      stat._hashed, hashed_percent,
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2016-11-09 11:14:21.451079053 +0100
-@@ -554,12 +554,12 @@
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2017-01-29 21:33:14.353347428 +0100
+@@ -596,12 +596,12 @@
  void G1StringDedupTable::print_statistics(outputStream* st) {
    st->print_cr(
      "   [Table]\n"
@@ -1335,8 +1314,8 @@
      G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)),
      _table->_size, _min_size, _max_size,
      _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed,
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -333,7 +333,7 @@
                                                    bool during_conc_mark,
                                                    size_t marked_bytes) {
@@ -1575,8 +1554,8 @@
                             bottom(), end(), object_num);
      *failures = true;
      return;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2017-01-29 21:33:14.353347428 +0100
 @@ -52,7 +52,7 @@
  class HeapRegionSetBase;
  class nmethod;
@@ -1597,8 +1576,8 @@
                     p2i(containing_set), p2i(_containing_set)));
  
      _containing_set = containing_set;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2017-01-29 21:33:14.353347428 +0100
 @@ -112,7 +112,7 @@
  
    assert(ClassUnloadingWithConcurrentMark,
@@ -1608,8 +1587,8 @@
                "addr: " PTR_FORMAT,
                p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
  
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -432,7 +432,7 @@
      HeapRegion* hr = _regions.get_by_index(i);
      guarantee(hr != NULL, err_msg("invariant: i: %u", i));
@@ -1619,8 +1598,8 @@
                        i, HR_FORMAT_PARAMS(hr), p2i(prev_end)));
      guarantee(hr->hrm_index() == i,
                err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index()));
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp	2017-01-29 21:33:14.353347428 +0100
 @@ -31,9 +31,9 @@
  
  inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
@@ -1633,8 +1612,8 @@
  
    HeapRegion* hr = _regions.get_by_address(addr);
    return hr;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2017-01-29 21:33:14.353347428 +0100
 @@ -381,7 +381,7 @@
  
  void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
@@ -1698,8 +1677,8 @@
    free(dummy);
    guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
    // try to reset the state
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -32,7 +32,7 @@
  uint FreeRegionList::_unrealistically_long_length = 0;
  
@@ -1754,8 +1733,8 @@
  
      if (curr->next() != NULL) {
        guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -668,7 +668,7 @@
    jlong ret_val = now - _time_of_last_gc;
    // XXX See note in genCollectedHeap::millis_since_last_gc().
@@ -1765,8 +1744,8 @@
      return 0;
    }
    return ret_val;
---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -3307,7 +3307,7 @@
    jlong ret_val = now - _time_of_last_gc;
    // XXX See note in genCollectedHeap::millis_since_last_gc().
@@ -1776,8 +1755,8 @@
      return 0;
    }
    return ret_val;
---- openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -86,7 +86,7 @@
          while (words_left_to_fill > 0) {
            size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size());
@@ -1787,8 +1766,8 @@
              words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size()));
            CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill);
            if (!os::numa_has_static_binding()) {
---- openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -98,10 +98,10 @@
    if (_allocated == 0) {
      assert(_unused == 0,
@@ -1804,8 +1783,8 @@
                     _allocated, _wasted, _unused, _used));
  
      _allocated = 1;
---- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2017-01-29 21:33:14.357347336 +0100
 @@ -158,8 +158,8 @@
    // Mapping from address to card marking array entry
    jbyte* byte_for(const void* p) const {
@@ -1839,8 +1818,8 @@
                     p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
      return byte_for(p) - _byte_map;
    }
---- openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -1403,7 +1403,7 @@
    // back a time later than 'now'.
    jlong retVal = now - tolgc_cl.time();
@@ -1850,8 +1829,8 @@
      return 0;
    }
    return retVal;
---- openjdk/hotspot/src/share/vm/memory/generation.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/generation.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/memory/generation.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/generation.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -193,7 +193,7 @@
    bool   res = (available >= max_promotion_in_bytes);
    if (PrintGC && Verbose) {
@@ -1861,8 +1840,8 @@
        res? "":" not", available, res? ">=":"<",
        max_promotion_in_bytes);
    }
---- openjdk/hotspot/src/share/vm/memory/generation.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/generation.hpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/memory/generation.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/generation.hpp	2017-01-29 21:33:14.357347336 +0100
 @@ -422,7 +422,7 @@
      // have to guard against non-monotonicity.
      NOT_PRODUCT(
@@ -1872,8 +1851,8 @@
        }
      )
      return _time_of_last_gc;
---- openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -161,7 +161,7 @@
  
    NOT_PRODUCT(
@@ -1883,8 +1862,8 @@
              _soft_ref_timestamp_clock, now);
    }
    )
---- openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2016-11-09 11:14:21.455078963 +0100
+--- openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -306,8 +306,8 @@
    bool   res = (available >= av_promo) || (available >= max_promotion_in_bytes);
    if (PrintGC && Verbose) {
@@ -1896,8 +1875,8 @@
        res? "":" not", available, res? ">=":"<",
        av_promo, max_promotion_in_bytes);
    }
---- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2017-01-29 21:33:14.357347336 +0100
 @@ -94,10 +94,10 @@
  
    if (PrintTLAB && Verbose) {
@@ -1913,8 +1892,8 @@
                          "slow", p2i(thrd), thrd->osthread()->thread_id(),
                          obj_size, free(), refill_waste_limit());
    }
---- openjdk/hotspot/src/share/vm/memory/universe.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/memory/universe.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/memory/universe.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/memory/universe.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -926,7 +926,7 @@
  // Reserve the Java heap, which is now the same for all GCs.
  ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
@@ -1924,8 +1903,8 @@
            alignment, Arguments::conservative_max_heap_alignment()));
    size_t total_reserved = align_size_up(heap_size, alignment);
    assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
---- openjdk/hotspot/src/share/vm/oops/constantPool.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/oops/constantPool.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/constantPool.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -1494,7 +1494,7 @@
        }
        case JVM_CONSTANT_Long: {
@@ -1935,8 +1914,8 @@
          ent_size = 8;
          idx++; // Long takes two cpool slots
          break;
---- openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -305,7 +305,7 @@
                     adapter->size_of_parameters());
  
@@ -1963,8 +1942,8 @@
    st->print_cr("                 -------------");
  }
  
---- openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2017-01-29 21:33:14.357347336 +0100
 @@ -192,7 +192,7 @@
      field_index_mask           = right_n_bits(field_index_bits),
      parameter_size_bits        = 8,  // subset of field_index_mask, range is 0..255
@@ -1974,8 +1953,8 @@
    };
  
    // specific bit definitions for the indices field:
---- openjdk/hotspot/src/share/vm/oops/markOop.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/markOop.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/oops/markOop.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/markOop.cpp	2017-01-29 21:33:14.357347336 +0100
 @@ -49,7 +49,7 @@
          st->print("monitor=NULL");
        else {
@@ -1985,8 +1964,8 @@
                  mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
        }
      } else {
---- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -657,7 +657,7 @@
        if (i > max_objArray_print_length) {
          st->print("..."); break;
@@ -1996,8 +1975,8 @@
      }
      st->print(" }");
    }
---- openjdk/hotspot/src/share/vm/oops/oop.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/oop.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/oops/oop.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/oops/oop.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -46,7 +46,7 @@
  
  void oopDesc::print_address_on(outputStream* st) const {
@@ -2007,8 +1986,8 @@
    }
  }
  
---- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -1321,27 +1321,27 @@
  
  // These are the native methods on java.lang.invoke.MethodHandleNatives.
@@ -2050,8 +2029,8 @@
  };
  
  /**
---- openjdk/hotspot/src/share/vm/prims/perf.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/prims/perf.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/prims/perf.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/perf.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -290,13 +290,13 @@
  #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
  #define BB "Ljava/nio/ByteBuffer;"
@@ -2070,8 +2049,8 @@
    {CC"createLong",          CL_ARGS,          FN_PTR(Perf_CreateLong)},
    {CC"createByteArray",     CBA_ARGS,         FN_PTR(Perf_CreateByteArray)},
    {CC"highResCounter",      CC"()J",          FN_PTR(Perf_HighResCounter)},
---- openjdk/hotspot/src/share/vm/prims/unsafe.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp	2016-11-09 11:16:51.511722720 +0100
+--- openjdk/hotspot/src/share/vm/prims/unsafe.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -1057,7 +1057,7 @@
  UNSAFE_END
  
@@ -2523,8 +2502,8 @@
  };
  
  #undef CC
---- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -918,7 +918,7 @@
  
      case _running:
@@ -2588,8 +2567,8 @@
                  _max_vmop_time / MICROUNITS);
  }
  
---- openjdk/hotspot/src/share/vm/services/threadService.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/services/threadService.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/services/threadService.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/services/threadService.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -889,7 +889,7 @@
        st->print("  waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
        oop obj = (oop)waitingToLockMonitor->object();
@@ -2599,8 +2578,8 @@
                     (InstanceKlass::cast(obj->klass()))->external_name());
  
          if (!currentThread->current_pending_monitor_is_from_java()) {
---- openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2017-01-29 21:33:14.361347245 +0100
 @@ -40,31 +40,31 @@
    TraceStream(outputStream& stream): _st(stream) {}
  
@@ -2640,8 +2619,8 @@
    }
  
    void print_val(const char* label, bool val) {
---- openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2016-10-17 14:44:43.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2016-11-30 13:10:08.000000000 +0100
++++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2017-01-29 21:33:14.361347245 +0100
 @@ -277,7 +277,7 @@
    size_t limit = (len + 16) / 16 * 16;
    for (size_t i = 0; i < limit; ++i) {
@@ -2660,8 +2639,8 @@
               LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
               os::current_process_id(), (int64_t)time_ms);
      // Write VM version header immediately.
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h	2016-11-03 19:13:23.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h	2016-11-09 11:14:21.459078873 +0100
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h	2017-01-25 05:22:03.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h	2017-01-29 21:33:14.361347245 +0100
 @@ -223,7 +223,7 @@
      AO_HAVE_FIELD_FLAGS_HI    = 1<<10,
      AO_HAVE_METHOD_FLAGS_HI   = 1<<11,
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 2d6dc02..d6baec9 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package java-1_8_0-openjdk
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64}
-%global icedtea_version 3.2.0
+%global icedtea_version 3.3.0
 %global icedtea_sound_version 1.0.1
 %global buildoutputdir openjdk.build/
 # Convert an absolute path to a relative path.  Each symbolic link is
@@ -32,7 +32,7 @@
 # priority must be 6 digits in total
 %global priority        1805
 %global javaver         1.8.0
-%global updatever       111
+%global updatever       121
 # Standard JPackage directories and symbolic links.
 %global sdklnk          java-%{javaver}-openjdk
 %global archname        %{sdklnk}
diff --git a/jaxp.tar.xz b/jaxp.tar.xz
index ada448b..1c40509 100644
--- a/jaxp.tar.xz
+++ b/jaxp.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61d6c7a44746ace38812582474b66c2c96f1ce9c7bd5b9ad251b4d5982bee6d6
-size 2301272
+oid sha256:ba5933a2bbf04b0786fd5f046d43314f1b1b2bf2888c586521b37410783bccef
+size 2302792
diff --git a/jaxws.tar.xz b/jaxws.tar.xz
index dcda390..98f1c80 100644
--- a/jaxws.tar.xz
+++ b/jaxws.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1285b9cb273b6fa97f985ace4cb6b5dc1963b1d5e0ae06ad4802f5ff678465b9
-size 2268764
+oid sha256:a443f3243978a87a055ab103468878e5e072706ab0c82d1949ba869fc63571b6
+size 2269396
diff --git a/jdk.tar.xz b/jdk.tar.xz
index 62f4c49..bccd768 100644
--- a/jdk.tar.xz
+++ b/jdk.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92557d8fbf826a643c730bbb4081e87140eb45e40e5662fd3d75829b5f61c9c5
-size 38857856
+oid sha256:688e962ab13055eb6b8668bb48b50eecc7f02f5120b541cfa58f516f875f9f9d
+size 38972276
diff --git a/langtools.tar.xz b/langtools.tar.xz
index c55ae5a..25457a7 100644
--- a/langtools.tar.xz
+++ b/langtools.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94d1754bba9020b2ee658c7adc2388ac38208e71e55650dc0393d24b20816a4d
-size 2061172
+oid sha256:1b0b0fb49c81955573ce509e1801530faa6477e606192fec4b0f951904fb8ac0
+size 2070432
diff --git a/nashorn.tar.xz b/nashorn.tar.xz
index ba71b49..85921f6 100644
--- a/nashorn.tar.xz
+++ b/nashorn.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f72fedfa82415fdf98a0a9bf01d2c171b060810b314bf5bb1c69b57123dc910
-size 2227096
+oid sha256:0ec045c9c4506f63602d86e72b0c3fdccd75fa95c47ee6a1238639274dc8e92d
+size 2229336
diff --git a/openjdk.tar.xz b/openjdk.tar.xz
index ea7dbba..8c67205 100644
--- a/openjdk.tar.xz
+++ b/openjdk.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c1040b4044efdd0c413d15865304f1ac46230d91435a31347a7b755e91e7924
-size 336232
+oid sha256:887c5bc24b068efced7d5209367149ca27d8fea330cd5a5fff7767c353b00921
+size 337064