File project.diff of Package java-1_8_0-openjdk

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package java-1_8_0-openjdk (Revision 5bba917d865eb0aed6592474513bd4d6)

Currently displaying revision 5bba917d865eb0aed6592474513bd4d6 , Show latest

--- java-1_8_0-openjdk-gcc6.patch.orig
+++ java-1_8_0-openjdk-gcc6.patch
@@ -1,6 +1,6 @@
---- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2016-05-26 12:10:00.372271144 +0200
-@@ -370,7 +370,7 @@
+--- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2016-07-26 08:53:13.487394436 +0200
+@@ -373,7 +373,7 @@
  
    void print_on(outputStream* st) const {
      symbol()->print_value_on(st);
@@ -9,8 +9,8 @@
      st->print(" -> ");
      bool printed = false;
      if (method() != NULL) {
---- openjdk/hotspot/src/share/vm/code/dependencies.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/dependencies.hpp	2016-05-26 09:54:26.985052426 +0200
+--- openjdk/hotspot/src/share/vm/code/dependencies.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/code/dependencies.hpp	2016-07-26 08:53:13.487394436 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2016-05-26 12:10:49.951179870 +0200
+--- openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2016-07-26 08:53:13.487394436 +0200
 @@ -186,7 +186,7 @@
  void ImplicitExceptionTable::print(address base) const {
    tty->print("{");
@@ -31,9 +31,9 @@
    tty->print_cr("}");
  }
  
---- openjdk/hotspot/src/share/vm/code/nmethod.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2016-05-26 13:02:58.606199557 +0200
-@@ -2717,7 +2717,7 @@
+--- openjdk/hotspot/src/share/vm/code/nmethod.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2016-07-26 08:53:13.491394350 +0200
+@@ -2721,7 +2721,7 @@
        _nm->print_nmethod(true);
        _ok = false;
      }
@@ -42,7 +42,7 @@
                    (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
    }
    virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
-@@ -2841,7 +2841,7 @@
+@@ -2845,7 +2845,7 @@
        _nm->print_nmethod(true);
        _ok = false;
      }
@@ -51,7 +51,7 @@
                    (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
      (*p)->print();
    }
-@@ -2886,7 +2886,7 @@
+@@ -2890,7 +2890,7 @@
    print_on(tty, NULL);
  
    if (WizardMode) {
@@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2016-05-26 11:46:17.171551069 +0200
+--- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2016-07-26 08:53:13.491394350 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/disassembler.cpp	2016-05-26 17:39:50.810335217 +0200
+--- openjdk/hotspot/src/share/vm/compiler/disassembler.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/compiler/disassembler.cpp	2016-07-26 08:53:13.491394350 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2016-05-26 11:56:14.462435073 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2016-07-26 08:53:13.491394350 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp	2016-05-26 11:27:48.216051826 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp	2016-07-26 08:53:13.491394350 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2016-05-26 11:51:28.440718154 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2016-07-26 08:53:13.491394350 +0200
 @@ -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-05-26 09:53:16.842635850 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	2016-05-26 10:22:30.895158677 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	2016-07-26 08:53:13.491394350 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp	2016-05-26 11:26:58.521150295 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp	2016-07-26 08:53:13.491394350 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp	2016-05-26 12:11:18.986540731 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	2016-05-26 12:13:13.360022784 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2016-05-26 11:41:15.870184374 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2016-05-26 12:13:55.231100865 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2016-05-26 11:47:09.062412333 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2016-05-26 12:47:00.759357577 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2016-07-26 08:53:13.495394263 +0200
 @@ -230,7 +230,7 @@
    HeapRegion* last = NULL;
    while (curr != NULL) {
@@ -805,7 +805,7 @@
                   minimum_desired_capacity, maximum_desired_capacity));
  
    // Should not be greater than the heap max size. No need to adjust
-@@ -2990,10 +2990,10 @@
+@@ -2991,10 +2991,10 @@
      if (!oopDesc::is_null(heap_oop)) {
        oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
        if (_g1h->is_obj_dead_cond(obj, _vo)) {
@@ -819,7 +819,7 @@
          }
          obj->print_on(gclog_or_tty);
          _failures = true;
-@@ -3040,9 +3040,9 @@
+@@ -3041,9 +3041,9 @@
        // Verify that the strong code root list for this region
        // contains the nmethod
        if (!hrrs->strong_code_roots_list_contains(_nm)) {
@@ -832,7 +832,7 @@
                                p, _nm, hr->bottom(), hr->end());
          _failures = true;
        }
-@@ -3172,7 +3172,7 @@
+@@ -3173,7 +3173,7 @@
      if (o != NULL) {
        HeapWord *start = (HeapWord *) o;
        size_t word_sz = o->size();
@@ -841,7 +841,7 @@
                            " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
                            (void*) o, word_sz,
                            _g1->isMarkedPrev(o),
-@@ -3183,7 +3183,7 @@
+@@ -3184,7 +3184,7 @@
        int *val;
        for (cur = start; cur < end; cur++) {
          val = (int *) cur;
@@ -850,7 +850,7 @@
        }
      }
    }
-@@ -3218,9 +3218,9 @@
+@@ -3219,9 +3219,9 @@
          r->object_iterate(&not_dead_yet_cl);
          if (_vo != VerifyOption_G1UseNextMarking) {
            if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) {
@@ -863,7 +863,7 @@
                                     r->bottom(), r->end(),
                                     r->max_live_bytes(),
                                   not_dead_yet_cl.live_bytes());
-@@ -4372,7 +4372,7 @@
+@@ -4409,7 +4409,7 @@
  G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state,
                                                 oop old) {
    assert(obj_in_cs(old),
@@ -872,7 +872,7 @@
                   (HeapWord*) old));
    markOop m = old->mark();
    oop forward_ptr = old->forward_to_atomic(old);
-@@ -4406,7 +4406,7 @@
+@@ -4443,7 +4443,7 @@
      // space for this object (old != forward_ptr) or they beat us in
      // self-forwarding it (old == forward_ptr).
      assert(old == forward_ptr || !obj_in_cs(forward_ptr),
@@ -881,7 +881,7 @@
                     "should not be in the CSet",
                     (HeapWord*) old, (HeapWord*) forward_ptr));
      return forward_ptr;
-@@ -4793,16 +4793,16 @@
+@@ -4830,16 +4830,16 @@
  
    ~G1StringSymbolTableUnlinkTask() {
      guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
@@ -902,7 +902,7 @@
                               strings_processed(), strings_removed(),
                               symbols_processed(), symbols_removed());
      }
-@@ -6001,13 +6001,13 @@
+@@ -6034,13 +6034,13 @@
  bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
                                                 HeapWord* tams, HeapWord* end) {
    guarantee(tams <= end,
@@ -919,7 +919,7 @@
                             bitmap_name, tams, end);
      return false;
    }
-@@ -6033,7 +6033,7 @@
+@@ -6066,7 +6066,7 @@
      res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
    }
    if (!res_p || !res_n) {
@@ -928,7 +928,7 @@
                             HR_FORMAT_PARAMS(hr));
      gclog_or_tty->print_cr("#### Caller: %s", caller);
      return false;
-@@ -6345,7 +6345,7 @@
+@@ -6378,7 +6378,7 @@
          !r->rem_set()->is_empty()) {
  
        if (G1TraceEagerReclaimHumongousObjects) {
@@ -937,7 +937,7 @@
                                 region_idx,
                                 obj->size()*HeapWordSize,
                                 r->bottom(),
-@@ -6367,7 +6367,7 @@
+@@ -6400,7 +6400,7 @@
                        r->bottom()));
  
      if (G1TraceEagerReclaimHumongousObjects) {
@@ -946,7 +946,7 @@
                               region_idx,
                               obj->size()*HeapWordSize,
                               r->bottom(),
-@@ -6523,7 +6523,7 @@
+@@ -6556,7 +6556,7 @@
    NoYoungRegionsClosure() : _success(true) { }
    bool doHeapRegion(HeapRegion* r) {
      if (r->is_young()) {
@@ -955,7 +955,7 @@
                               r->bottom(), r->end());
        _success = false;
      }
-@@ -6652,7 +6652,7 @@
+@@ -6685,7 +6685,7 @@
    }
    assert(_allocator->used_unlocked() == recalculate_used(),
           err_msg("inconsistent _allocator->used_unlocked(), "
@@ -964,7 +964,7 @@
                   _allocator->used_unlocked(), recalculate_used()));
  }
  
-@@ -6873,8 +6873,8 @@
+@@ -6906,8 +6906,8 @@
        oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        assert(!hr->continuesHumongous(),
@@ -975,7 +975,7 @@
                       _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
  
        // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
-@@ -6900,8 +6900,8 @@
+@@ -6933,8 +6933,8 @@
        oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        assert(!hr->continuesHumongous(),
@@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp	2016-05-26 11:41:38.465684126 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2016-05-26 12:28:18.488090472 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2016-05-26 10:27:51.635941074 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	2016-07-26 08:53:13.495394263 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	2016-05-26 12:14:48.289932520 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	2016-07-26 08:53:13.499394177 +0200
 @@ -330,7 +330,7 @@
  }
  
@@ -1082,8 +1082,8 @@
      }
    }
  
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2016-05-26 12:47:45.006381979 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp	2016-07-26 08:53:13.499394177 +0200
 @@ -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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	2016-05-26 10:28:29.947078914 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp	2016-07-26 08:53:13.499394177 +0200
 @@ -118,7 +118,7 @@
    oop obj = oopDesc::load_decode_heap_oop(p);
    if (_cm->verbose_high()) {
@@ -1132,9 +1132,9 @@
                             _task->worker_id(), p2i(p), p2i((void*) obj));
    }
    _task->deal_with_reference(obj);
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2016-05-26 12:29:29.638523189 +0200
-@@ -443,7 +443,7 @@
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp	2016-07-26 08:53:13.499394177 +0200
+@@ -442,7 +442,7 @@
  bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
                             bool check_for_refs_into_cset) {
    assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)),
@@ -1143,8 +1143,8 @@
                   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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	2016-05-26 12:31:58.331247475 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	2016-07-26 08:53:13.499394177 +0200
 @@ -187,22 +187,22 @@
    size_t code_root_elems() const { return _code_root_elems; }
  
@@ -1257,8 +1257,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2016-05-26 12:32:32.962484479 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp	2016-07-26 08:53:13.499394177 +0200
 @@ -151,7 +151,7 @@
  void G1StringDedupQueue::print_statistics(outputStream* st) {
    st->print_cr(
@@ -1268,8 +1268,8 @@
  }
  
  void G1StringDedupQueue::verify() {
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2016-05-26 12:35:03.483167917 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp	2016-07-26 08:53:13.499394177 +0200
 @@ -80,8 +80,8 @@
    st->stamp(PrintGCTimeStamps);
    st->print_cr(
@@ -1314,8 +1314,8 @@
      stat._inspected,
      stat._skipped, skipped_percent,
      stat._hashed, hashed_percent,
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2016-05-26 12:36:33.497184339 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2016-07-26 08:53:13.499394177 +0200
 @@ -554,12 +554,12 @@
  void G1StringDedupTable::print_statistics(outputStream* st) {
    st->print_cr(
@@ -1335,8 +1335,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2016-05-26 12:53:29.330784386 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp	2016-07-26 08:59:08.759705707 +0200
 @@ -333,7 +333,7 @@
                                                    bool during_conc_mark,
                                                    size_t marked_bytes) {
@@ -1419,7 +1419,7 @@
              prev_top_at_mark_start(), next_top_at_mark_start());
    G1OffsetTableContigSpace::print_on(st);
  }
-@@ -699,25 +699,25 @@
+@@ -708,25 +708,25 @@
          }
          if (!_g1h->is_in_closed_subset(obj)) {
            HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
@@ -1454,27 +1454,27 @@
                                   (void*) obj, to->bottom(), to->end());
            print_object(gclog_or_tty, obj);
          }
-@@ -753,14 +753,14 @@
-               gclog_or_tty->print_cr("----------");
-             }
-             gclog_or_tty->print_cr("Missing rem set entry:");
--            gclog_or_tty->print_cr("Field "PTR_FORMAT" "
--                                   "of obj "PTR_FORMAT", "
--                                   "in region "HR_FORMAT,
+@@ -784,14 +784,14 @@
+             gclog_or_tty->print_cr("----------");
+           }
+           gclog_or_tty->print_cr("Missing rem set entry:");
+-          gclog_or_tty->print_cr("Field "PTR_FORMAT" "
+-                                 "of obj "PTR_FORMAT", "
+-                                 "in region "HR_FORMAT,
 +            gclog_or_tty->print_cr("Field " PTR_FORMAT " "
 +                                   "of obj " PTR_FORMAT ", "
 +                                   "in region " HR_FORMAT,
-                                    p, (void*) _containing_obj,
-                                    HR_FORMAT_PARAMS(from));
-             _containing_obj->print_on(gclog_or_tty);
--            gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
--                                   "in region "HR_FORMAT,
+                                  p, (void*) _containing_obj,
+                                  HR_FORMAT_PARAMS(from));
+           _containing_obj->print_on(gclog_or_tty);
+-          gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
+-                                 "in region "HR_FORMAT,
 +            gclog_or_tty->print_cr("points to obj " PTR_FORMAT " "
 +                                   "in region " HR_FORMAT,
-                                    (void*) obj,
-                                    HR_FORMAT_PARAMS(to));
-             obj->print_on(gclog_or_tty);
-@@ -797,8 +797,8 @@
+                                  (void*) obj,
+                                  HR_FORMAT_PARAMS(to));
+           obj->print_on(gclog_or_tty);
+@@ -828,8 +828,8 @@
  
      if (is_humongous != g1->isHumongous(obj_size) &&
          !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
@@ -1485,7 +1485,7 @@
                               p, g1->isHumongous(obj_size) ? "" : "non-",
                               obj_size, is_humongous ? "" : "non-");
         *failures = true;
-@@ -821,12 +821,12 @@
+@@ -852,12 +852,12 @@
                                     (vo == VerifyOption_G1UsePrevMarking &&
                                     ClassLoaderDataGraph::unload_list_contains(klass));
          if (!is_metaspace_object) {
@@ -1500,16 +1500,16 @@
                                   "not a klass", klass, (void *)obj);
            *failures = true;
            return;
-@@ -842,7 +842,7 @@
+@@ -889,7 +889,7 @@
            }
          }
        } else {
--        gclog_or_tty->print_cr(PTR_FORMAT" no an oop", (void *)obj);
-+        gclog_or_tty->print_cr(PTR_FORMAT " no an oop", (void *)obj);
+-        gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj);
++        gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj);
          *failures = true;
          return;
        }
-@@ -852,8 +852,8 @@
+@@ -899,8 +899,8 @@
    }
  
    if (p != top()) {
@@ -1520,7 +1520,7 @@
      *failures = true;
      return;
    }
-@@ -868,8 +868,8 @@
+@@ -915,8 +915,8 @@
      HeapWord* addr_1 = p;
      HeapWord* b_start_1 = _offsets.block_start_const(addr_1);
      if (b_start_1 != p) {
@@ -1531,7 +1531,7 @@
                               addr_1, b_start_1, p);
        *failures = true;
        return;
-@@ -880,8 +880,8 @@
+@@ -927,8 +927,8 @@
      if (addr_2 < the_end) {
        HeapWord* b_start_2 = _offsets.block_start_const(addr_2);
        if (b_start_2 != p) {
@@ -1542,7 +1542,7 @@
                                 addr_2, b_start_2, p);
          *failures = true;
          return;
-@@ -894,8 +894,8 @@
+@@ -941,8 +941,8 @@
      if (addr_3 < the_end) {
        HeapWord* b_start_3 = _offsets.block_start_const(addr_3);
        if (b_start_3 != p) {
@@ -1553,7 +1553,7 @@
                                 addr_3, b_start_3, p);
          *failures = true;
          return;
-@@ -906,8 +906,8 @@
+@@ -953,8 +953,8 @@
      HeapWord* addr_4 = the_end - 1;
      HeapWord* b_start_4 = _offsets.block_start_const(addr_4);
      if (b_start_4 != p) {
@@ -1564,7 +1564,7 @@
                               addr_4, b_start_4, p);
        *failures = true;
        return;
-@@ -915,8 +915,8 @@
+@@ -962,8 +962,8 @@
    }
  
    if (is_humongous && object_num > 1) {
@@ -1575,8 +1575,8 @@
                             bottom(), end(), object_num);
      *failures = true;
      return;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2016-05-26 11:06:12.004686196 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp	2016-07-26 08:53:13.499394177 +0200
 @@ -52,7 +52,7 @@
  class HeapRegionSetBase;
  class nmethod;
@@ -1597,8 +1597,8 @@
                     p2i(containing_set), p2i(_containing_set)));
  
      _containing_set = containing_set;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2016-05-26 11:07:06.895462623 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp	2016-07-26 08:53:13.499394177 +0200
 @@ -112,7 +112,7 @@
  
    assert(ClassUnloadingWithConcurrentMark,
@@ -1608,8 +1608,8 @@
                "addr: " PTR_FORMAT,
                p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
  
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2016-05-26 12:54:27.965488199 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp	2016-07-26 08:53:13.503394090 +0200
 @@ -432,7 +432,7 @@
      HeapRegion* hr = _regions.get_by_index(i);
      guarantee(hr != NULL, err_msg("invariant: i: %u", i));
@@ -1619,8 +1619,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp	2016-05-26 11:28:38.902931314 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp	2016-07-26 08:53:13.503394090 +0200
 @@ -31,9 +31,9 @@
  
  inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
@@ -1633,9 +1633,9 @@
  
    HeapRegion* hr = _regions.get_by_address(addr);
    return hr;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2016-05-26 12:56:34.138698971 +0200
-@@ -377,7 +377,7 @@
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2016-07-26 08:53:13.503394090 +0200
+@@ -381,7 +381,7 @@
  
  void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
    guarantee((size_t)start_idx + new_num_regions <= max_uintx,
@@ -1644,7 +1644,7 @@
                      start_idx, new_num_regions));
    for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
      uint end_idx = (start_idx + (uint)new_num_regions);
-@@ -392,7 +392,7 @@
+@@ -396,7 +396,7 @@
  void FromCardCache::print(outputStream* out) {
    for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
      for (uint j = 0; j < _max_regions; j++) {
@@ -1653,7 +1653,7 @@
                      i, j, at(i, j));
      }
    }
-@@ -432,7 +432,7 @@
+@@ -436,7 +436,7 @@
    int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
  
    if (G1TraceHeapRegionRememberedSet) {
@@ -1662,7 +1662,7 @@
                    hr()->bottom(), from_card,
                    FromCardCache::at((uint)tid, cur_hrm_ind));
    }
-@@ -637,13 +637,13 @@
+@@ -641,13 +641,13 @@
  
    assert(_coarse_map.size() == region_bm->size(), "Precondition");
    if (G1RSScrubVerbose) {
@@ -1678,7 +1678,7 @@
    }
  
    // Now do the fine-grained maps.
-@@ -1039,7 +1039,7 @@
+@@ -1043,7 +1043,7 @@
  
    card_index = _cur_region_card_offset + _cur_card_in_prt;
    guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
@@ -1687,7 +1687,7 @@
    return true;
  }
  
-@@ -1208,8 +1208,8 @@
+@@ -1212,8 +1212,8 @@
  
    size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
    assert(dummy->mem_size() > min_prt_size,
@@ -1698,8 +1698,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	2016-05-26 12:58:02.492745763 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	2016-07-26 08:53:13.503394090 +0200
 @@ -32,7 +32,7 @@
  uint FreeRegionList::_unrealistically_long_length = 0;
  
@@ -1754,8 +1754,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2016-05-26 13:04:12.804559217 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2016-07-26 08:53:13.503394090 +0200
 @@ -668,7 +668,7 @@
    jlong ret_val = now - _time_of_last_gc;
    // XXX See note in genCollectedHeap::millis_since_last_gc().
@@ -1765,8 +1765,8 @@
      return 0;
    }
    return ret_val;
---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2016-05-26 13:05:21.415042398 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2016-07-26 08:53:13.503394090 +0200
 @@ -3307,7 +3307,7 @@
    jlong ret_val = now - _time_of_last_gc;
    // XXX See note in genCollectedHeap::millis_since_last_gc().
@@ -1776,8 +1776,8 @@
      return 0;
    }
    return ret_val;
---- openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2016-05-26 12:59:21.407001218 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2016-07-26 08:53:13.503394090 +0200
 @@ -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 +1787,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	2016-05-26 13:02:08.355310474 +0200
+--- openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	2016-07-26 08:53:13.503394090 +0200
 @@ -98,10 +98,10 @@
    if (_allocated == 0) {
      assert(_unused == 0,
@@ -1804,8 +1804,8 @@
                     _allocated, _wasted, _unused, _used));
  
      _allocated = 1;
---- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2016-05-26 10:59:28.465678473 +0200
+--- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2016-07-26 08:53:13.503394090 +0200
 @@ -158,8 +158,8 @@
    // Mapping from address to card marking array entry
    jbyte* byte_for(const void* p) const {
@@ -1839,8 +1839,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2016-05-26 12:37:30.739922837 +0200
+--- openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2016-07-26 08:53:13.507394004 +0200
 @@ -1403,7 +1403,7 @@
    // back a time later than 'now'.
    jlong retVal = now - tolgc_cl.time();
@@ -1850,8 +1850,8 @@
      return 0;
    }
    return retVal;
---- openjdk/hotspot/src/share/vm/memory/generation.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/generation.cpp	2016-05-26 12:48:26.325470906 +0200
+--- openjdk/hotspot/src/share/vm/memory/generation.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/generation.cpp	2016-07-26 08:53:13.507394004 +0200
 @@ -193,7 +193,7 @@
    bool   res = (available >= max_promotion_in_bytes);
    if (PrintGC && Verbose) {
@@ -1861,8 +1861,8 @@
        res? "":" not", available, res? ">=":"<",
        max_promotion_in_bytes);
    }
---- openjdk/hotspot/src/share/vm/memory/generation.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/generation.hpp	2016-05-26 10:57:11.760723475 +0200
+--- openjdk/hotspot/src/share/vm/memory/generation.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/generation.hpp	2016-07-26 08:53:13.507394004 +0200
 @@ -422,7 +422,7 @@
      // have to guard against non-monotonicity.
      NOT_PRODUCT(
@@ -1872,8 +1872,8 @@
        }
      )
      return _time_of_last_gc;
---- openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2016-05-26 13:05:59.246206036 +0200
+--- openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2016-07-26 08:53:13.507394004 +0200
 @@ -161,7 +161,7 @@
  
    NOT_PRODUCT(
@@ -1883,8 +1883,8 @@
              _soft_ref_timestamp_clock, now);
    }
    )
---- openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2016-05-26 13:08:41.746613475 +0200
+--- openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2016-07-26 08:53:13.507394004 +0200
 @@ -306,8 +306,8 @@
    bool   res = (available >= av_promo) || (available >= max_promotion_in_bytes);
    if (PrintGC && Verbose) {
@@ -1896,8 +1896,8 @@
        res? "":" not", available, res? ">=":"<",
        av_promo, max_promotion_in_bytes);
    }
---- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2016-05-26 10:58:22.423149606 +0200
+--- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2016-07-26 08:53:13.507394004 +0200
 @@ -94,10 +94,10 @@
  
    if (PrintTLAB && Verbose) {
@@ -1913,18 +1913,9 @@
                          "slow", p2i(thrd), thrd->osthread()->thread_id(),
                          obj_size, free(), refill_waste_limit());
    }
---- openjdk/hotspot/src/share/vm/memory/universe.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/universe.cpp	2016-05-26 10:52:15.903311125 +0200
-@@ -863,7 +863,7 @@
-       Universe::set_narrow_oop_use_implicit_null_checks(false);
- #endif
-       if (verbose) {
--        tty->print(", %s: "PTR_FORMAT,
-+        tty->print(", %s: " PTR_FORMAT,
-             narrow_oop_mode_to_string(HeapBasedNarrowOop),
-             Universe::narrow_oop_base());
-       }
-@@ -919,7 +919,7 @@
+--- openjdk/hotspot/src/share/vm/memory/universe.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/memory/universe.cpp	2016-07-26 08:53:13.507394004 +0200
+@@ -922,7 +922,7 @@
  // Reserve the Java heap, which is now the same for all GCs.
  ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
    assert(alignment <= Arguments::conservative_max_heap_alignment(),
@@ -1933,8 +1924,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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.cpp	2016-05-26 11:56:40.741857589 +0200
+--- openjdk/hotspot/src/share/vm/oops/constantPool.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/oops/constantPool.cpp	2016-07-26 08:53:13.511393917 +0200
 @@ -1494,7 +1494,7 @@
        }
        case JVM_CONSTANT_Long: {
@@ -1944,8 +1935,8 @@
          ent_size = 8;
          idx++; // Long takes two cpool slots
          break;
---- openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2016-05-26 12:09:06.825449649 +0200
+--- openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/oops/cpCache.cpp	2016-07-26 08:53:13.511393917 +0200
 @@ -305,7 +305,7 @@
                     adapter->size_of_parameters());
  
@@ -1972,8 +1963,8 @@
    st->print_cr("                 -------------");
  }
  
---- openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2016-05-26 10:02:53.553645325 +0200
+--- openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/oops/cpCache.hpp	2016-07-26 08:53:13.511393917 +0200
 @@ -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
@@ -1983,8 +1974,8 @@
    };
  
    // specific bit definitions for the indices field:
---- openjdk/hotspot/src/share/vm/oops/markOop.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/markOop.cpp	2016-05-26 12:58:48.551727547 +0200
+--- openjdk/hotspot/src/share/vm/oops/markOop.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/oops/markOop.cpp	2016-07-26 08:53:13.511393917 +0200
 @@ -49,7 +49,7 @@
          st->print("monitor=NULL");
        else {
@@ -1994,8 +1985,8 @@
                  mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
        }
      } else {
---- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2016-05-26 13:01:09.576609909 +0200
+--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2016-07-26 08:53:13.511393917 +0200
 @@ -657,7 +657,7 @@
        if (i > max_objArray_print_length) {
          st->print("..."); break;
@@ -2005,8 +1996,8 @@
      }
      st->print(" }");
    }
---- openjdk/hotspot/src/share/vm/oops/oop.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oop.cpp	2016-05-26 13:01:34.580057152 +0200
+--- openjdk/hotspot/src/share/vm/oops/oop.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/oops/oop.cpp	2016-07-26 08:53:13.511393917 +0200
 @@ -46,7 +46,7 @@
  
  void oopDesc::print_address_on(outputStream* st) const {
@@ -2016,20 +2007,8 @@
    }
  }
  
---- openjdk/hotspot/src/share/vm/opto/node.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/node.cpp	2016-05-26 23:23:12.204803196 +0200
-@@ -325,6 +325,9 @@
- // Create a Node, with a given number of required edges.
- Node::Node(uint req)
-   : _idx(IDX_INIT(req))
-+#ifdef ASSERT
-+  , _parse_idx(_idx)
-+#endif
- {
-   assert( req < Compile::current()->max_node_limit() - NodeLimitFudgeFactor, "Input limit exceeded" );
-   debug_only( verify_construction() );
---- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2016-05-26 17:41:49.547683485 +0200
+--- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp	2016-07-26 08:53:16.463330089 +0200
 @@ -1321,27 +1321,27 @@
  
  // These are the native methods on java.lang.invoke.MethodHandleNatives.
@@ -2071,8 +2050,8 @@
  };
  
  /**
---- openjdk/hotspot/src/share/vm/prims/perf.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/prims/perf.cpp	2016-05-26 17:43:23.553584000 +0200
+--- openjdk/hotspot/src/share/vm/prims/perf.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/prims/perf.cpp	2016-07-26 08:53:16.463330089 +0200
 @@ -290,13 +290,13 @@
  #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
  #define BB "Ljava/nio/ByteBuffer;"
@@ -2091,9 +2070,9 @@
    {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-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp	2016-05-26 22:52:04.455104439 +0200
-@@ -1009,7 +1009,7 @@
+--- openjdk/hotspot/src/share/vm/prims/unsafe.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp	2016-07-26 08:53:16.463330089 +0200
+@@ -1027,7 +1027,7 @@
  UNSAFE_END
  
  
@@ -2102,7 +2081,7 @@
  // define a class but do not make it known to the class loader or system dictionary
  // - host_class:  supplies context for linkage, access control, protection domain, and class loader
  // - data:  bytes of a class file, a raw memory address (length gives the number of bytes)
-@@ -1374,47 +1374,47 @@
+@@ -1392,47 +1392,47 @@
  
  #define LANG "Ljava/lang/"
  
@@ -2170,7 +2149,7 @@
  
      DECLARE_GETSETOOP_140(Boolean, Z),
      DECLARE_GETSETOOP_140(Byte, B),
-@@ -1433,33 +1433,33 @@
+@@ -1451,33 +1451,33 @@
      DECLARE_GETSETNATIVE(Float, F),
      DECLARE_GETSETNATIVE(Double, D),
  
@@ -2223,7 +2202,7 @@
  
      DECLARE_GETSETOOP_141(Boolean, Z),
      DECLARE_GETSETOOP_141(Byte, B),
-@@ -1478,37 +1478,37 @@
+@@ -1496,37 +1496,37 @@
      DECLARE_GETSETNATIVE(Float, F),
      DECLARE_GETSETNATIVE(Double, D),
  
@@ -2283,7 +2262,7 @@
  
  
      DECLARE_GETSETOOP(Boolean, Z),
-@@ -1528,42 +1528,42 @@
+@@ -1546,42 +1546,42 @@
      DECLARE_GETSETNATIVE(Float, F),
      DECLARE_GETSETNATIVE(Double, D),
  
@@ -2352,7 +2331,7 @@
  
      DECLARE_GETSETOOP(Boolean, Z),
      DECLARE_GETSETOOP(Byte, B),
-@@ -1582,45 +1582,45 @@
+@@ -1600,45 +1600,45 @@
      DECLARE_GETSETNATIVE(Float, F),
      DECLARE_GETSETNATIVE(Double, D),
  
@@ -2428,7 +2407,7 @@
  
      DECLARE_GETSETOOP(Boolean, Z),
      DECLARE_GETSETOOP(Byte, B),
-@@ -1639,36 +1639,36 @@
+@@ -1657,36 +1657,36 @@
      DECLARE_GETSETNATIVE(Float, F),
      DECLARE_GETSETNATIVE(Double, D),
  
@@ -2490,7 +2469,7 @@
  };
  
  JNINativeMethod loadavg_method[] = {
-@@ -1676,28 +1676,28 @@
+@@ -1694,28 +1694,28 @@
  };
  
  JNINativeMethod prefetch_methods[] = {
@@ -2529,9 +2508,9 @@
  };
  
  JNINativeMethod fence_methods[] = {
---- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2016-05-26 13:07:57.251597177 +0200
-@@ -987,7 +987,7 @@
+--- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2016-07-26 08:53:16.463330089 +0200
+@@ -918,7 +918,7 @@
  
      case _running:
      default:
@@ -2540,7 +2519,7 @@
                        _thread, _type);
         _thread->print();
        ShouldNotReachHere();
-@@ -1286,7 +1286,7 @@
+@@ -1217,7 +1217,7 @@
      sstats = &_safepoint_stats[index];
      tty->print("%.3f: ", sstats->_time_stamp);
      tty->print("%-26s       ["
@@ -2549,7 +2528,7 @@
                 "    ]    ",
                 sstats->_vmop_type == -1 ? "no vm operation" :
                 VM_Operation::name(sstats->_vmop_type),
-@@ -1295,8 +1295,8 @@
+@@ -1226,8 +1226,8 @@
                 sstats->_nof_threads_wait_to_block);
      // "/ MICROUNITS " is to convert the unit from nanos to millis.
      tty->print("  ["
@@ -2560,7 +2539,7 @@
                 INT64_FORMAT_W(6)"    ]  ",
                 sstats->_time_to_spin / MICROUNITS,
                 sstats->_time_to_wait_to_block / MICROUNITS,
-@@ -1305,9 +1305,9 @@
+@@ -1236,9 +1236,9 @@
                 sstats->_time_to_exec_vmop / MICROUNITS);
  
      if (need_to_track_page_armed_status) {
@@ -2572,7 +2551,7 @@
    }
  }
  
-@@ -1344,17 +1344,17 @@
+@@ -1275,17 +1275,17 @@
  
    for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
      if (_safepoint_reasons[index] != 0) {
@@ -2594,8 +2573,8 @@
                  _max_vmop_time / MICROUNITS);
  }
  
---- openjdk/hotspot/src/share/vm/services/threadService.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/services/threadService.cpp	2016-05-26 13:09:19.365781782 +0200
+--- openjdk/hotspot/src/share/vm/services/threadService.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/services/threadService.cpp	2016-07-26 08:53:16.467330003 +0200
 @@ -889,7 +889,7 @@
        st->print("  waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
        oop obj = (oop)waitingToLockMonitor->object();
@@ -2605,8 +2584,8 @@
                     (InstanceKlass::cast(obj->klass()))->external_name());
  
          if (!currentThread->current_pending_monitor_is_from_java()) {
---- openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2016-05-26 11:00:29.636315730 +0200
+--- openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/trace/traceStream.hpp	2016-07-26 08:53:16.467330003 +0200
 @@ -40,31 +40,31 @@
    TraceStream(outputStream& stream): _st(stream) {}
  
@@ -2646,8 +2625,8 @@
    }
  
    void print_val(const char* label, bool val) {
---- openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2016-02-16 08:11:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2016-05-26 13:03:26.341586400 +0200
+--- openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2016-07-25 07:38:24.000000000 +0200
++++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp	2016-07-26 08:53:16.467330003 +0200
 @@ -277,7 +277,7 @@
    size_t limit = (len + 16) / 16 * 16;
    for (size_t i = 0; i < limit; ++i) {
@@ -2666,8 +2645,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-05-26 23:02:50.676441820 +0200
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h	2016-05-26 23:04:12.838577867 +0200
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h	2016-07-25 07:38:26.000000000 +0200
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h	2016-07-26 08:53:16.467330003 +0200
 @@ -223,7 +223,7 @@
      AO_HAVE_FIELD_FLAGS_HI    = 1<<10,
      AO_HAVE_METHOD_FLAGS_HI   = 1<<11,
--- java-1_8_0-openjdk.changes.orig
+++ java-1_8_0-openjdk.changes
@@ -1,4 +1,454 @@
 -------------------------------------------------------------------
+Tue Jul 26 05:57:42 UTC 2016 - fstrba@suse.com
+
+- Upgrade to version jdk8u101 (icedtea 3.1.0, .....)
+- New in release 3.1.0 (2016-07-25):
+  * Security fixes
+    - S8079718, CVE-2016-3458: IIOP Input Stream Hooking
+    - S8145446, CVE-2016-3485: Perfect pipe placement (Windows
+      only)
+    - S8146514: Enforce GCM limits
+    - S8147771: Construction of static protection domains under
+      Javax custom policy
+    - S8148872, CVE-2016-3500: Complete name checking
+    - S8149070: Enforce update ordering
+    - S8149962, CVE-2016-3508: Better delineation of XML processing
+    - S8150752: Share Class Data
+    - S8151925: Font reference improvements
+    - S8152479, CVE-2016-3550: Coded byte streams
+    - S8153312: Constrain AppCDS behavior
+    - S8154475, CVE-2016-3587: Clean up lookup visibility
+    - S8155981, CVE-2016-3606: Bolster bytecode verification
+    - S8155985, CVE-2016-3598: Persistent Parameter Processing
+    - S8158571, CVE-2016-3610: Additional method handle validation
+  * New features
+    - S8145547, PR1061: [AWT/Swing] Conditional support for GTK 3
+      on Linux
+    - PR2821: Support building OpenJDK with --disable-headful
+    - PR2931, G478960: Provide Infinality Support via fontconfig
+    - PR3079: Provide option to build Shenandoah on x86_64
+  * Import of OpenJDK 8 u92 build 14
+    - S6869327: Add new C2 flag to keep safepoints in counted
+      loops.
+    - S8022865: [TESTBUG] Compressed Oops testing needs to be
+      revised
+    - S8029630: Thread id should be displayed as a hex number in
+      error report
+    - S8029726: On OS X some dtrace probe names are mismatched with
+      Solaris
+    - S8029727: On OS X dtrace probes
+      Call<type>MethodA/Call<type>MethodV are not fired.
+    - S8029728: On OS X dtrace probes SetStaticBooleanField are not
+      fired
+    - S8038184: XMLSignature throws StringIndexOutOfBoundsException
+      if ID attribute value is empty String
+    - S8038349: Signing XML with DSA throws Exception when key is
+      larger than 1024 bits
+    - S8041501: ImageIO reader is not capable of reading JPEGs
+      without JFIF header
+    - S8041900: [macosx] Java forces the use of discrete GPU
+    - S8044363: Remove special build options for unpack200 executable
+    - S8046471: Use OPENJDK_TARGET_CPU_ARCH instead of legacy value
+      for hotspot ARCH
+    - S8046611: Build errors with gcc on sparc/fastdebug
+    - S8047763: Recognize sparc64 as a sparc platform
+    - S8048232: Fix for 8046471 breaks PPC64 build
+    - S8052396: Catch exceptions resulting from missing font cmap
+    - S8058563: InstanceKlass::_dependencies list isn't cleared from
+      empty nmethodBucket entries
+    - S8061624: [TESTBUG] Some tests cannot be ran under compact
+      profiles and therefore shall be excluded
+    - S8062901: Iterators is spelled incorrectly in the Javadoc for
+      Spliterator
+    - S8064330: Remove SHA224 from the default support list if
+      SunMSCAPI enabled
+    - S8065579: WB method to start G1 concurrent mark cycle should
+      be introduced
+    - S8065986: Compiler fails to NullPointerException when calling
+      super with Object<>()
+    - S8066974: Compiler doesn't infer method's generic type
+      information in lambda body
+    - S8067800: Clarify java.time.chrono.Chronology.isLeapYear for
+      out of range years
+    - S8068033: JNI exception pending in jdk/src/share/bin/java.c
+    - S8068042: Check jdk/src/share/native/sun/misc/URLClassPath.c
+      for JNI pending
+    - S8068162: jvmtiRedefineClasses.cpp: guarantee(false) failed:
+      OLD and/or OBSOLETE method(s) found
+    - S8068254: Method reference uses wrong qualifying type
+    - S8074696: Remote debugging session hangs for several minutes
+      when calling findBootType
+    - S8074935: jdk8 keytool doesn't validate pem files for RFC 1421
+      correctness, as jdk7 did
+    - S8078423: [TESTBUG] javax/print/PrintSEUmlauts/PrintSEUmlauts.java
+      relies on system locale
+    - S8080492: [Parfait] Uninitialised variable in
+      jdk/src/java/desktop/windows/native/libawt/
+    - S8080650: Enable stubs to use frame pointers correctly
+    - S8122944: perfdata used is seen as too high on sparc zone with
+      jdk1.9 and causes a test failure
+    - S8129348: Debugger hangs in trace mode with TRACE_SENDS
+    - S8129847: Compiling methods generated by Nashorn triggers high
+      memory usage in C2
+    - S8130506: javac AssertionError when invoking
+      MethodHandle.invoke with lambda parameter
+    - S8130910: hsperfdata file is created in wrong directory and
+      not cleaned up if /tmp/hsperfdata_<username> has wrong permissions
+    - S8131129: Attempt to define a duplicate BMH$Species class
+    - S8131665: Bad exception message in HandshakeHash.getFinishedHash
+    - S8131782: C1 Class.cast optimization breaks when Class is
+      loaded from static final
+    - S8132503: [macosx] Chinese full stop symbol cannot be entered
+      with Pinyin IM on OS X
+    - S8133207: ParallelProbes.java test fails after changes for
+      JDK-8080115
+    - S8133924: NPE may be thrown when xsltc select a non-existing
+      node after JDK-8062518
+    - S8134007: Improve string folding
+    - S8134759: jdb: Incorrect stepping inside finally block
+    - S8134963: [Newtest] New stress test for changing the coarseness
+      level of G1 remembered set
+    - S8136442: Don't tie Certificate signature algorithms to
+      ciphersuites
+    - S8137106: EUDC (End User Defined Characters) are not displayed
+      on Windows with Java 8u60+
+    - S8138745: Implement ExitOnOutOfMemory and CrashOnOutOfMemory
+      in HotSpot
+    - S8138764: In some cases the usage of TreeLock can be replaced
+      by other synchronization
+    - S8139373: [TEST_BUG] java/net/MulticastSocket/MultiDead.java
+      failed with timeout
+    - S8139424: SIGSEGV, Problematic frame: # V [libjvm.so+0xd0c0cc]
+      void InstanceKlass::oop_oop_iterate_oop_maps_specialized<true,oopDesc*,MarkAndPushClosure>
+    - S8139436: sun.security.mscapi.KeyStore might load incomplete
+      data
+    - S8139751: Javac crash with -XDallowStringFolding=false
+    - S8139863: [TESTBUG] Need to port tests for JDK-8134903 to
+      8u-dev
+    - S8139985: JNI exception pending in
+      jdk/src/jdk/hprof/agent/share/native/libhprof
+    - S8140031: SA: Searching for a value in Threads does not work
+    - S8140249: JVM Crashing During startUp If Flight Recording is
+      enabled
+    - S8140344: add support for 3 digit update release numbers
+    - S8140587: Atomic*FieldUpdaters should use Class.isInstance
+      instead of direct class check
+    - S8141260: isReachable crash in windows xp
+    - S8143297: Nashorn compilation time reported in nanoseconds
+    - S8143397: It looks like InetAddress.isReachable(timeout) works
+      incorrectly
+    - S8143855: Bad printf formatting in frame_zero.cpp
+    - S8143896: java.lang.Long is implicitly converted to double
+    - S8143963: improve ClassLoader::trace_class_path to accept an
+      additional outputStream* arg
+    - S8144020: Remove long as an internal numeric type
+    - S8144131: ArrayData.getInt implementations do not convert to
+      int32
+    - S8144483: One long Safepoint pause directly after each GC log
+      rotation
+    - S8144487: PhaseIdealLoop::build_and_optimize() must restore
+      major_progress flag if skip_loop_opts is true
+    - S8144885: agent/src/os/linux/libproc.h needs to support
+      Linux/SPARC builds
+    - S8144935: C2: safepoint is pruned from a non-counted loop
+    - S8144937: [TEST_BUG] testlibrary_tests should be excluded for
+      compact1 and compact2 execution
+    - S8145017: Add support for 3 digit hotspot minor version numbers
+    - S8145099: Better error message when SA can't attach to a process
+    - S8145442: Add the facility to verify remembered sets for G1
+    - S8145466: javac: No line numbers in compilation error
+    - S8145539: (coll) AbstractMap.keySet and .values should not be
+      volatile
+    - S8145550: Megamorphic invoke should use CompiledFunction
+      variants without any LinkLogic
+    - S8145669: apply2call optimized callsite fails after becoming
+      megamorphic
+    - S8145722: NullPointerException in javadoc
+    - S8145754: PhaseIdealLoop::is_scaled_iv_plus_offset() does not
+      match AddI
+    - S8146147: Java linker indexed property getter does not work
+      for computed nashorn string
+    - S8146566: OpenJDK build can't handle commas in LDFLAGS
+    - S8146725: Issues with SignatureAndHashAlgorithm.getSupportedAlgorithms
+    - S8146979: Backport of 8046471 breaks ppc64 build in jdk8u
+      because 8072383 was badly backported before
+    - S8147087: Race when reusing PerRegionTable bitmaps may result
+      in dropped remembered set entries
+    - S8147630: Wrong test result pushed to 8u-dev
+    - S8147845: Varargs Array functions still leaking longs
+    - S8147857: RMIConnector logs attribute names incorrectly
+    - S8148353: [linux-sparc] Crash in libawt.so on Linux SPARC
+    - S8150791: 8u76 L10n resource file translation update
+  * Import of OpenJDK 8 u101 build 13
+    - S6483657: MSCAPI provider does not create unique alias names
+    - S6675699: need comprehensive fix for unconstrained ConvI2L
+      with narrowed type
+    - S8037557: test SessionCacheSizeTests.java timeout
+    - S8038837: Add support to jarsigner for specifying timestamp
+      hash algorithm
+    - S8081778: Use Intel x64 CPU instructions for RSA acceleration
+    - S8130150: Implement BigInteger.montgomeryMultiply intrinsic
+    - S8130735: javax.swing.TimerQueue: timer fires late when
+      another timer starts
+    - S8143913: MSCAPI keystore should accept Certificate[] in
+      setEntry()
+    - S8144313: Test SessionTimeOutTests can be timeout
+    - S8146240: Three nashorn files contain "GNU General Public
+      License" header
+    - S8146387: Test SSLSession/SessionCacheSizeTests socket accept
+      timed out
+    - S8146669: Test SessionTimeOutTests fails intermittently
+    - S8146993: Several javax/management/remote/mandatory regression
+      tests fail after JDK-8138811
+    - S8147994: [macosx] JScrollPane jitters up/down during trackpad
+      scrolling on MacOS/Aqua
+    - S8151522: Disable 8130150 and 8081778 intrinsics by default
+    - S8151876: (tz) Support tzdata2016d
+    - S8152098: Fix 8151522 caused test
+      compiler/intrinsics/squaretolen/TestSquareToLen.java to fail
+    - S8157077: 8u101 L10n resource file updates
+  * Backports
+    - S6260348, PR3066: GTK+ L&F JTextComponent not respecting
+      desktop caret blink rate
+    - S6778087, PR1061: getLocationOnScreen() always returns (0, 0)
+      for mouse wheel events
+    - S6961123, PR2972: setWMClass fails to null-terminate WM_CLASS
+      string
+    - S8008657, PR3077: JSpinner setComponentOrientation doesn't
+      affect on text orientation
+    - S8014212, PR2866: Robot captures black screen
+    - S8029339, PR1061: Custom MultiResolution image support on
+      HiDPI displays
+    - S8031145, PR3077: Re-examine closed i18n tests to see it they
+      can be moved to the jdk repository.
+    - S8034856, PR3095: gcc warnings compiling
+      src/solaris/native/sun/security/pkcs11
+    - S8034857, PR3095: gcc warnings compiling
+      src/solaris/native/sun/management
+    - S8035054, PR3095: JarFacade.c should not include ctype.h
+    - S8035287, PR3095: gcc warnings compiling various libraries
+      files
+    - S8038631, PR3077: Create wrapper for awt.Robot with additional
+      functionality
+    - S8039279, PR3077: Move awt tests to openjdk repository
+    - S8041561, PR3077: Inconsistent opacity behaviour between
+      JCheckBox and JRadioButton
+    - S8041592, PR3077: [TEST_BUG] Move 42 AWT hw/lw mixing tests
+      to jdk
+    - S8041915, PR3077: Move 8 awt tests to OpenJDK regression
+      tests tree
+    - S8043126, PR3077: move awt automated functional tests from
+      AWT_Events/Lw and AWT_Events/AWT to OpenJDK repository
+    - S8043131, PR3077: Move ShapedAndTranslucentWindows and GC
+      functional AWT tests to regression tree
+    - S8044157, PR3077: [TEST_BUG] Improve recently submitted
+      AWT_Mixing tests
+    - S8044172, PR3077: [TEST_BUG] Move regtests for 4523758 and
+      AltPlusNumberKeyCombinationsTest to jdk
+    - S8044429, PR3077: move awt automated tests for AWT_Modality
+      to OpenJDK repository
+    - S8044762, PR2960: com/sun/jdi/OptionTest.java test time out
+    - S8044765, PR3077: Move functional tests
+      AWT_SystemTray/Automated to openjdk repository
+    - S8047180, PR3077: Move functional tests AWT_Headless/Automated
+      to OpenJDK repository
+    - S8047367, PR3077: move awt automated tests from AWT_Modality
+      to OpenJDK repository - part 2
+    - S8048246, PR3077: Move AWT_DnD/Clipboard/Automated functional
+      tests to OpenJDK
+    - S8049226, PR2960: com/sun/jdi/OptionTest.java test times out
+      again
+    - S8049617, PR3077: move awt automated tests from AWT_Modality
+      to OpenJDK repository - part 3
+    - S8049694, PR3077: Migrate functional
+      AWT_DesktopProperties/Automated tests to OpenJDK
+    - S8050885, PR3077: move awt automated tests from AWT_Modality
+      to OpenJDK repository - part 4
+    - S8051440, PR3077: move tests about maximizing undecorated to
+      OpenJDK
+    - S8052012, PR3077: move awt automated tests from AWT_Modality
+      to OpenJDK repository - part 5
+    - S8052408, PR3077: Move AWT_BAT functional tests to OpenJDK (3
+      of 3)
+    - S8053657, PR3077: [TEST_BUG] move some 5 tests related to
+      undecorated Frame/JFrame to JDK
+    - S8054143, PR3077: move awt automated tests from AWT_Modality
+      to OpenJDK repository - part 6
+    - S8054358, PR3077: move awt automated tests from AWT_Modality
+      to OpenJDK repository - part 7
+    - S8054359, PR3077: move awt automated tests from AWT_Modality
+      to OpenJDK repository - part 8
+    - S8055360, PR3077: Move the rest part of AWT
+      ShapedAndTranslucent tests to OpenJDK
+    - S8055664, PR3077: move 14 tests about setLocationRelativeTo
+      to jdk
+    - S8055836, PR3077: move awt tests from AWT_Modality to OpenJDK
+      repository - part 9
+    - S8056911, PR3077: Remove internal API usage from ExtendedRobot
+      class
+    - S8057694, PR3077: move awt tests from AWT_Modality to OpenJDK
+      repository - part 10
+    - S8058959, PR1061: closed/java/awt/event/ComponentEvent/MovedResizedTwiceTest/MovedResizedTwiceTest.java
+      failed automatically
+    - S8062606, PR3077: Fix a typo in java.awt.Robot class
+    - S8063102, PR3077: Change open awt regression tests to avoid
+      sun.awt.SunToolkit.realSync, part 1
+    - S8063104, PR3077: Change open awt regression tests to avoid
+      sun.awt.SunToolkit.realSync, part 2
+    - S8063106, PR3077: Change open swing regression tests to avoid
+      sun.awt.SunToolkit.realSync, part 1
+    - S8063107, PR3077: Change open swing regression tests to avoid
+      sun.awt.SunToolkit.realSync, part 2
+    - S8064573, PR3077: [TEST_BUG] javax/swing/text/AbstractDocument/6968363/Test6968363.java
+      is asocial pressing VK_LEFT and not releasing
+    - S8064575, PR3077: [TEST_BUG] javax/swing/JEditorPane/6917744/bug6917744.java
+      100 times press keys and never releases
+    - S8064809, PR3077: [TEST_BUG] javax/swing/JComboBox/4199622/bug4199622.java
+      contains a lot of keyPress and not a single keyRelease
+    - S8067441, PR3077: Some tests fails with error: cannot find symbol
+      getSystemMnemonicKeyCodes()
+    - S8068228, PR3077: Test closed/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest
+      fails with GTKLookAndFeel
+    - S8069361, PR1061: SunGraphics2D.getDefaultTransform() does not
+      include scale factor
+    - S8073320, PR1061: Windows HiDPI Graphics support
+    - S8074807, PR3077: Fix some tests unnecessary using internal API
+    - S8076315, PR3077: move 4 manual functional swing tests to
+      regression suite
+    - S8078504, PR3094: Zero lacks declaration of
+      VM_Version::initialize()
+    - S8129822, PR3077: Define "headful" jtreg keyword
+    - S8132123, PR1061: MultiResolutionCachedImage unnecessarily
+      creates base image to get its size
+    - S8133539, PR1061: [TEST_BUG] Split
+      java/awt/image/MultiResolutionImageTest.java in two to allow
+      restricted access
+    - S8137571, PR1061: Linux HiDPI Graphics support
+    - S8142406, PR1061: [TEST] MultiResolution image: need test to
+      cover the case when @2x image is corrupted
+    - S8145188, PR2945: No LocalVariableTable generated for the
+      entire JDK
+    - S8150258, PR1061: [TEST] HiDPI: create a test for
+      multiresolution menu items icons
+    - S8150724, PR1061: [TEST] HiDPI: create a test for
+      multiresolution icons
+    - S8150844, PR1061: [hidpi] [macosx] -Dsun.java2d.uiScale should
+      be taken into account for OS X
+    - S8151841, PR2882: Build needs additional flags to compile with
+      GCC 6 [plus parts of 8149647 & 8032045]
+    - S8155613, PR1061: [PIT] crash in
+      AWT_Desktop/Automated/Exceptions/BasicTest
+    - S8156020, PR1061: 8145547 breaks AIX and and uses RTLD_NOLOAD
+      incorrectly
+    - S8156128, PR1061: Tests for [AWT/Swing] Conditional support
+      for GTK 3 on Linux
+    - S8158260, PR2991, RH1341258: PPC64: unaligned Unsafe.getInt
+      can lead to the generation of illegal instructions
+    - S8159244, PR3074: Partially initialized string object created
+      by C2's string concat optimization may escape
+    - S8159690, PR3077: [TESTBUG] Mark headful tests with @key
+      headful.
+    - S8160294, PR2882, PR3095: Some client libraries cannot be
+      built with GCC 6
+  * Bug fixes
+    - PR1958: GTKLookAndFeel does not honor
+      gtk-alternative-button-order
+    - PR2822: Feed LIBS & CFLAGS into configure rather than make to
+      avoid re-discovery by OpenJDK configure
+    - PR2932: Support ccache in a non-automagic manner
+    - PR2933: Support ccache 3.2 and later
+    - PR2964: Set system defaults based on OS
+    - PR2974, RH1337583: PKCS#10 certificate requests now use CRLF
+      line endings rather than system line endings
+    - PR3078: Remove duplicated line dating back to 6788347 and
+      6894807
+    - PR3083, RH1346460: Regression in SSL debug output without an
+      ECC provider
+    - PR3089: Remove old memory limits patch
+    - PR3090, RH1204159: SystemTap is heavily confused by multiple
+      JDKs
+    - PR3095: Fix warnings in URLClassPath.c
+    - PR3096: Remove dead --disable-optimizations option
+    - PR3105: Use version from hotspot.map to create tarball filename
+    - PR3106: Handle both correctly-spelt property
+      "enableCustomValueHandler" introduced by S8079718 and typo
+      version
+    - PR3108: Shenandoah patches not included in release tarball
+    - PR3110: Update hotspot.map documentation in INSTALL
+  * AArch64 port
+    - S8145320, PR3078: Create unsafe_arraycopy and
+      generic_arraycopy for AArch64
+    - S8148328, PR3078: aarch64: redundant lsr instructions in stub
+      code.
+    - S8148783, PR3078: aarch64: SEGV running SpecJBB2013
+    - S8148948, PR3078: aarch64: generate_copy_longs calls align()
+      incorrectly
+    - S8149080, PR3078: AArch64: Recognise disjoint array copy in
+      stub code
+    - S8149365, PR3078: aarch64: memory copy does not prefetch on
+      backwards copy
+    - S8149907, PR3078: aarch64: use load/store pair instructions
+      in call_stub
+    - S8150038, PR3078: aarch64: make use of CBZ and CBNZ when
+      comparing narrow pointer with zero
+    - S8150045, PR3078: arraycopy causes segfaults in SATB during
+      garbage collection
+    - S8150082, PR3078: aarch64: optimise small array copy
+    - S8150229, PR3078: aarch64: pipeline class for several
+      instructions is not set correctly
+    - S8150313, PR3078: aarch64: optimise array copy using SIMD
+      instructions
+    - S8150394, PR3078: aarch64: add support for 8.1 LSE CAS
+      instructions
+    - S8151340, PR3078: aarch64: prefetch the destination word for
+      write prior to ldxr/stxr loops.
+    - S8151502, PR3078: optimize pd_disjoint_words and
+      pd_conjoint_words
+    - S8151775, PR3078: aarch64: add support for 8.1 LSE atomic
+      operations
+    - S8152537, PR3078: aarch64: Make use of CBZ and CBNZ when
+      comparing unsigned values with zero.
+    - S8152840, PR3078: aarch64: improve _unsafe_arraycopy stub
+      routine
+    - S8153713, PR3078: aarch64: improve short array clearing using
+      store pair
+    - S8153797, PR3078: aarch64: Add Arrays.fill stub code
+    - S8154537, PR3078: AArch64: some integer rotate instructions
+      are never emitted
+    - S8154739, PR3078: AArch64: TemplateTable::fast_xaccess loads
+      in wrong mode
+    - S8155015, PR3078: Aarch64: bad assert in spill generation
+      code
+    - S8155100, PR3078: AArch64: Relax alignment requirement for
+      byte_map_base
+    - S8155612, PR3078: Aarch64: vector nodes need to support
+      misaligned offset
+    - S8155617, PR3078: aarch64: ClearArray does not use DC ZVA
+    - S8155653, PR3078: TestVectorUnalignedOffset.java not pushed
+      with 8155612
+    - S8156731, PR3078: aarch64: java/util/Arrays/Correct.java fails
+      due to _generic_arraycopy stub routine
+    - S8157841, PR3078: aarch64: prefetch ignores cache line size
+    - S8157906, PR3078: aarch64: some more integer rotate
+      instructions are never emitted
+    - S8158913, PR3078: aarch64: SEGV running Spark terasort
+    - S8159052, PR3078: aarch64: optimise unaligned copies in
+      pd_disjoint_words and pd_conjoint_words
+    - S8159063, PR3078: aarch64: optimise unaligned array copy long
+    - PR3078: Cleanup remaining differences from aarch64/jdk8u tree
+- Removed patches:
+  * compare-pointer-with-literal.patch
+  * implicit-pointer-decl.patch
+  * hotspot-aarch64-fix-48bit-va.patch
+    - Fixed differently upsteam
+- Modified patch:
+  * java-1_8_0-openjdk-gcc6.patch
+    - Rediff to new context
+- Remove hacks to make build on ix86, since it seems they are not
+  needed anymore
+- Remove special flags for gcc6, since they are handled upstream
+
+-------------------------------------------------------------------
 Thu Jul  7 14:41:06 UTC 2016 - fstrba@suse.com
 
 - Fix script linking /usr/share/javazi/tzdb.dat for platform where
--- java-1_8_0-openjdk.spec.orig
+++ java-1_8_0-openjdk.spec
@@ -17,8 +17,8 @@
 
 
 %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
-%global jit_arches %ix86 x86_64 ppc64 ppc64le %aarch64
-%global icedtea_version 3.0.1
+%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64}
+%global icedtea_version 3.1.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       91
+%global updatever       101
 # Standard JPackage directories and symbolic links.
 %global sdklnk          java-%{javaver}-openjdk
 %global archname        %{sdklnk}
@@ -75,7 +75,7 @@
 %ifarch ppc64le
 %global archinstall ppc64le
 %endif
-%ifarch %ix86
+%ifarch %{ix86}
 %global archinstall i386
 %endif
 %ifarch ia64
@@ -87,10 +87,10 @@
 %ifarch s390x
 %global archinstall s390x
 %endif
-%ifarch %arm
+%ifarch %{arm}
 %global archinstall arm
 %endif
-%ifarch %aarch64
+%ifarch %{aarch64}
 %global archinstall aarch64
 %endif
 # 32 bit sparc, optimized for v9
@@ -109,7 +109,7 @@
 %endif
 # bnc#542545
 # 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
+%ifarch %{ix86} ppc s390
 %global bits 32
 %endif
 %ifarch x86_64 ia64 s390x
@@ -118,6 +118,7 @@
 %if 0%{?__isa_bits}
 %global bits %{__isa_bits}
 %endif
+%bcond_with zero
 %if 0%{?suse_version} >= 1330 || 0%{?suse_version} == 1315
 %if %{with bootstrap}
 %global with_sunec 0
@@ -127,7 +128,6 @@
 %else
 %global with_sunec 0
 %endif
-%bcond_with zero
 # Turn on/off some features depending on openSUSE version
 %if 0%{?suse_version} >= 1130
 %if ! %{with zero}
@@ -172,16 +172,10 @@ Source9:        http://icedtea.classpath
 Patch2:         1015432.patch
 # Restrict access to java-atk-wrapper classes
 Patch3:         java-atk-wrapper-security.patch
-# Fix expression compares a char* pointer with a string literal
-Patch8:         compare-pointer-with-literal.patch
 # Fix use of unintialized memory in adlc parser
 Patch12:        adlc-parser.patch
-# Fix: implicit-pointer-decl
-Patch13:        implicit-pointer-decl.patch
 # Avoid triggering inactivity timeout while generating javadoc in zero VM
 Patch14:        zero-javadoc-verbose.patch
-# Fix 48 bit va space on aarch64
-Patch15:        hotspot-aarch64-fix-48bit-va.patch
 #
 # OpenJDK specific patches
 #
@@ -204,7 +198,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  giflib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  java-bootstrap-devel >= 1.7.0
-BuildRequires:  libXcomposite-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  libpng-devel
@@ -215,6 +208,7 @@ BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  wget
 BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  xz
 BuildRequires:  zip
 # Requires rest of java
 Requires:       %{name}-headless = %{version}-%{release}
@@ -258,6 +252,7 @@ BuildRequires:  libffi-devel
 BuildRequires:  xorg-x11-devel
 %else
 BuildRequires:  libX11-devel
+BuildRequires:  libXcomposite-devel
 BuildRequires:  libXi-devel
 BuildRequires:  libXinerama-devel
 BuildRequires:  libXt-devel
@@ -410,7 +405,7 @@ for file in tapset/*.in; do
     sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/libjvm.so:g $file > $file.1
 # TODO find out which architectures other than ix86 have a client vm
 
-%ifarch %ix86
+%ifarch %{ix86}
     sed -e s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/libjvm.so:g $file.1 > $OUTPUT_FILE
 %else
     sed -e '/@ABS_CLIENT_LIBJVM_SO@/d' $file.1 > $OUTPUT_FILE
@@ -437,9 +432,6 @@ export ZLIB_LIBS="-L/%{_lib} -lz"
 %endif
 
 CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
-%if 0%{?suse_version} >= 1330
-CFLAGS+=" -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"
-%endif
 export CFLAGS
 export CXXFLAGS=${CFLAGS}
 %if %{with_sunec}
@@ -458,7 +450,7 @@ sh autogen.sh
         --disable-infinality \
         --disable-downloading \
         --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
-%ifnarch %arm %aarch64
+%ifnarch %{arm} %{aarch64}
         --with-parallel-jobs="${NUM_PROC}" \
 %endif
         --with-pkgversion="suse-%{release}-%{_arch}" \
@@ -491,16 +483,12 @@ make patch %{?_smp_mflags}
 
 patch -p0 -i %{PATCH2}
 patch -p0 -i %{PATCH3}
-patch -p0 -i %{PATCH8}
 patch -p0 -i %{PATCH12}
-patch -p0 -i %{PATCH13}
 
 %if %{with zero}
 patch -p0 -i %{PATCH14}
 %endif
 
-patch -p1 -i %{PATCH15}
-
 %ifarch ppc ppc64 ppc64le
 # PPC fixes
 patch -p0 -i %{PATCH103}
@@ -513,15 +501,7 @@ patch -p0 -i %{PATCH2001}
  bash ./autogen.sh
 )
 
-%if 0%{?suse_version} >= 1330
-%ifarch %ix86
-for i in {1..10}; do make %{?_smp_mflags} && break; done
-%else
 make %{?_smp_mflags}
-%endif
-%else
-make %{?_smp_mflags}
-%endif
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image

Places

File project.diff of Package java-1_8_0-openjdk (Revision 5bba917d865eb0aed6592474513bd4d6)

Places