[openjdk-7-jre-dcevm] 04/05: Fixed a linker error with G1SATBCardTableModRefBS

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-7-jre-dcevm.

commit c84cdbfaff740416309c2bcf4943f935ba2302da
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 22 11:33:26 2015 +0200

    Fixed a linker error with G1SATBCardTableModRefBS
---
 debian/changelog                      |  1 +
 debian/patches/fix-linker-error.patch | 45 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad1bfab..e467e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openjdk-7-jre-dcevm (7u79-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Fixed a linker error with G1SATBCardTableModRefBS
   * Build depend on GCC 5
   * Updated debian/watch
 
diff --git a/debian/patches/fix-linker-error.patch b/debian/patches/fix-linker-error.patch
new file mode 100644
index 0000000..d99c4b5
--- /dev/null
+++ b/debian/patches/fix-linker-error.patch
@@ -0,0 +1,45 @@
+Description: Fix a linker error with G1SATBCardTableModRefBS
+Origin: backport, http://icedtea.classpath.org//hg/icedtea7-forest/hotspot?cmd=changeset;node=cb42e88f9787
+Bug-IcedTea: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
+Bug-OpenJDK: https://bugs.openjdk.java.net/browse/JDK-8048214
+--- a/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
++++ b/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
+@@ -76,6 +76,17 @@
+   }
+ }
+ 
++void G1SATBCardTableModRefBS::write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) {
++  if (!dest_uninitialized) {
++    write_ref_array_pre_work(dst, count);
++  }
++}
++void G1SATBCardTableModRefBS::write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) {
++  if (!dest_uninitialized) {
++    write_ref_array_pre_work(dst, count);
++  }
++}
++
+ bool G1SATBCardTableModRefBS::mark_card_deferred(size_t card_index) {
+   jbyte val = _byte_map[card_index];
+   // It's already processed
+--- a/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
++++ b/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
+@@ -85,16 +85,8 @@
+   }
+ 
+   template <class T> void write_ref_array_pre_work(T* dst, int count);
+-  virtual void write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) {
+-    if (!dest_uninitialized) {
+-      write_ref_array_pre_work(dst, count);
+-    }
+-  }
+-  virtual void write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) {
+-    if (!dest_uninitialized) {
+-      write_ref_array_pre_work(dst, count);
+-    }
+-  }
++  virtual void write_ref_array_pre(oop* dst, int count, bool dest_uninitialized);
++  virtual void write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized);
+ 
+ /*
+    Claimed and deferred bits are used together in G1 during the evacuation
diff --git a/debian/patches/series b/debian/patches/series
index 5a1d70b..2f17bdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ distro-name.patch
 full-jdk7u79-b15.patch
 full-jdk7u60-deopt-cp.patch
 full-jdk7u79-b15-method-handles.patch
+fix-linker-error.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-7-jre-dcevm.git