Date: Monday, June 1, 2015 @ 22:58:11
Author: guillaume
Revision: 239998
Add patch to fix build with latest g++5
Added:
java7-openjdk/trunk/icedtea-7.2.5.5-gcc5.diff
Modified:
java7-openjdk/trunk/PKGBUILD
---------------------------+
PKGBUILD | 13 ++++++++++---
icedtea-7.2.5.5-gcc5.diff | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-06-01 18:56:55 UTC (rev 239997)
+++ PKGBUILD 2015-06-01 20:58:11 UTC (rev 239998)
@@ -38,8 +38,11 @@
icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
- openjdk7_nonreparenting-wm.diff)
+ openjdk7_nonreparenting-wm.diff
+ icedtea-7.2.5.5-gcc5.diff)
+# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
+
sha256sums=('f05b1db06021f4cd3a39647f358a47130136d189431fb55f79855f627b1d6619'
'5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d'
'f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51'
@@ -49,7 +52,8 @@
'71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660'
'd724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
- '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
+ '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
+ '49f8b65e24f6e6c8afa9e48b11f6e1675ef2c5d3bfe31fd7d73c8de1f4150cf2')
noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -69,6 +73,8 @@
lib/${_JARCH}/libsplashscreen.so
lib/${_JARCH}/xawt/libmawt.so)
+
+
build() {
cd "${srcdir}/icedtea-${_icedtea_ver}"
@@ -79,7 +85,8 @@
cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
- patches/openjdk7_nonreparenting-wm.diff"
+ patches/openjdk7_nonreparenting-wm.diff \
+ patches/icedtea-7.2.5.5-gcc5.diff"
if [ "$_bootstrap" = "1" ]; then
BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
Added: icedtea-7.2.5.5-gcc5.diff
===================================================================
--- icedtea-7.2.5.5-gcc5.diff (rev 0)
+++ icedtea-7.2.5.5-gcc5.diff 2015-06-01 20:58:11 UTC (rev 239998)
@@ -0,0 +1,41 @@
+---
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
Thu Jun 26 10:00:00 2014 +0200
++++
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
Thu Jun 26 13:20:18 2014 +0200
+@@ -66,6 +66,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
+---
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
Thu Jun 26 10:00:00 2014 +0200
++++
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
Thu Jun 26 13:20:18 2014 +0200
+@@ -86,16 +86,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
