Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/java7-openjdk/patches/java7-openjdk-7.2.5.5-gcc5.patch

    Contents of /trunk/java7-openjdk/patches/java7-openjdk-7.2.5.5-gcc5.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2599 - (show annotations) (download)
    Thu Jun 25 14:34:26 2015 UTC (8 years, 10 months ago) by niro
    File size: 1693 byte(s) 
    -fix build with gcc5
    1 --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Thu Jun 26 10:00:00 2014 +0200
    2 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Thu Jun 26 13:20:18 2014 +0200
    3 @@ -66,6 +66,17 @@
    4 }
    5 }
    6
    7 +void G1SATBCardTableModRefBS::write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) {
    8 + if (!dest_uninitialized) {
    9 + write_ref_array_pre_work(dst, count);
    10 + }
    11 +}
    12 +void G1SATBCardTableModRefBS::write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) {
    13 + if (!dest_uninitialized) {
    14 + write_ref_array_pre_work(dst, count);
    15 + }
    16 +}
    17 +
    18 bool G1SATBCardTableModRefBS::mark_card_deferred(size_t card_index) {
    19 jbyte val = _byte_map[card_index];
    20 // It's already processed
    21 --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Thu Jun 26 10:00:00 2014 +0200
    22 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Thu Jun 26 13:20:18 2014 +0200
    23 @@ -86,16 +86,8 @@
    24 }
    25
    26 template <class T> void write_ref_array_pre_work(T* dst, int count);
    27 - virtual void write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) {
    28 - if (!dest_uninitialized) {
    29 - write_ref_array_pre_work(dst, count);
    30 - }
    31 - }
    32 - virtual void write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) {
    33 - if (!dest_uninitialized) {
    34 - write_ref_array_pre_work(dst, count);
    35 - }
    36 - }
    37 + virtual void write_ref_array_pre(oop* dst, int count, bool dest_uninitialized);
    38 + virtual void write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized);
    39
    40 /*
    41 Claimed and deferred bits are used together in G1 during the evacuation