[arch-commits] Commit in java7-openjdk/trunk (3 files)

Guillaume Alaux guillaume at archlinux.org
Mon Jul 20 12:34:57 UTC 2015


    Date: Monday, July 20, 2015 @ 14:34:57
  Author: guillaume
Revision: 242384

Upstream release 7.u80_2.6.0

Modified:
  java7-openjdk/trunk/PKGBUILD
Deleted:
  java7-openjdk/trunk/hotspot_fix_memory_leak.diff
  java7-openjdk/trunk/icedtea-7.2.5.5-gcc5.diff

------------------------------+
 PKGBUILD                     |   34 ++++++++++++------------------
 hotspot_fix_memory_leak.diff |   46 -----------------------------------------
 icedtea-7.2.5.5-gcc5.diff    |   41 ------------------------------------
 3 files changed, 14 insertions(+), 107 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-20 10:27:59 UTC (rev 242383)
+++ PKGBUILD	2015-07-20 12:34:57 UTC (rev 242384)
@@ -6,13 +6,13 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.5.5
+_icedtea_ver=2.6.0
 #pkgver() {
 #  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
 #    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
 #  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
 #}
-_updatever=79
+_updatever=80
 pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
 pkgrel=1
 
@@ -25,7 +25,7 @@
 makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
              'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
-             'eclipse-ecj')
+             'eclipse-ecj' 'pcsclite' 'lksctp-tools')
 
 _icedtea_url=http://icedtea.classpath.org/download
 _drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
@@ -38,24 +38,20 @@
         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
-        icedtea-7.2.5.5-gcc5.diff
-        hotspot_fix_memory_leak.diff)
+        openjdk7_nonreparenting-wm.diff)
 
 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
 
-sha256sums=('f05b1db06021f4cd3a39647f358a47130136d189431fb55f79855f627b1d6619'
-            '5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d'
-            'f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51'
-            '293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256'
-            '76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be'
-            'c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483'
-            '71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660'
-            'd724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb'
+sha256sums=('b45c829dc937360ed7fbd19505be42007a3abfa8df4afeb77cd9ef70abcdc7a9'
+            '20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b'
+            '5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb'
+            '8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07'
+            '816a6d7a4bd302871d73f5681f6b35459000d76bfb9fa04b3479ffb630dc39f5'
+            '900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c'
+            '63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661'
+            '8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
-            '49f8b65e24f6e6c8afa9e48b11f6e1675ef2c5d3bfe31fd7d73c8de1f4150cf2'
-            '0de78abc8ff96e11ba3ad43f1e8194c26c5d06363cb5b7c8aa660e1ea21127a1')
+            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
 
 noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
            icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -87,9 +83,7 @@
 
   cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/openjdk7_nonreparenting-wm.diff \
-                               patches/icedtea-7.2.5.5-gcc5.diff \
-                               patches/hotspot_fix_memory_leak.diff"
+                               patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"

Deleted: hotspot_fix_memory_leak.diff
===================================================================
--- hotspot_fix_memory_leak.diff	2015-07-20 10:27:59 UTC (rev 242383)
+++ hotspot_fix_memory_leak.diff	2015-07-20 12:34:57 UTC (rev 242384)
@@ -1,46 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1430335428 25200
-# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b
-# Parent  cd8fe1a9205aedb6b5a1fc16e664412e48aee565
-8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
-Summary: do the math on the unsigned type where overflows are well defined
-Reviewed-by: kvn, aph
-
-diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp
---- openjdk/hotspot/src/share/vm/opto/type.cpp	Wed Jun 10 20:15:29 2015 -0400
-+++ openjdk/hotspot/src/share/vm/opto/type.cpp	Wed Apr 29 12:23:48 2015 -0700
-@@ -1180,11 +1180,11 @@
-   // Certain normalizations keep us sane when comparing types.
-   // The 'SMALLINT' covers constants and also CC and its relatives.
-   if (lo <= hi) {
--    if ((juint)(hi - lo) <= SMALLINT)  w = Type::WidenMin;
--    if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
-+    if (((juint)hi - lo) <= SMALLINT)  w = Type::WidenMin;
-+    if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
-   } else {
--    if ((juint)(lo - hi) <= SMALLINT)  w = Type::WidenMin;
--    if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
-+    if (((juint)lo - hi) <= SMALLINT)  w = Type::WidenMin;
-+    if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
-   }
-   return w;
- }
-@@ -1438,11 +1438,11 @@
-   // Certain normalizations keep us sane when comparing types.
-   // The 'SMALLINT' covers constants.
-   if (lo <= hi) {
--    if ((julong)(hi - lo) <= SMALLINT)   w = Type::WidenMin;
--    if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
-+    if (((julong)hi - lo) <= SMALLINT)   w = Type::WidenMin;
-+    if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
-   } else {
--    if ((julong)(lo - hi) <= SMALLINT)   w = Type::WidenMin;
--    if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
-+    if (((julong)lo - hi) <= SMALLINT)   w = Type::WidenMin;
-+    if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
-   }
-   return w;
- }
-

Deleted: icedtea-7.2.5.5-gcc5.diff
===================================================================
--- icedtea-7.2.5.5-gcc5.diff	2015-07-20 10:27:59 UTC (rev 242383)
+++ icedtea-7.2.5.5-gcc5.diff	2015-07-20 12:34:57 UTC (rev 242384)
@@ -1,41 +0,0 @@
---- 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



More information about the arch-commits mailing list