CVS commit: pkgsrc/lang/openjdk8

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/openjdk8
From: "Joerg Sonnenberger" <joerg%netbsd.org@localhost>
Date: Thu, 15 Dec 2016 23:56:53 +0000

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Dec 15 23:56:53 UTC 2016

Modified Files:
        pkgsrc/lang/openjdk8: Makefile distinfo
Added Files:
        pkgsrc/lang/openjdk8/patches:
            patch-hotspot_src_share_vm_classfile_symbolTable.cpp
            patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
            patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
            patch-hotspot_src_share_vm_memory_metaspace.cpp
            patch-hotspot_src_share_vm_opto_lcm.cpp
            patch-hotspot_src_share_vm_runtime_virtualspace.cpp

Log Message:
Fix portability issues. Bump revision, since the preprocessor definition
potentially changes the package.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/openjdk8/Makefile \
    pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.42 pkgsrc/lang/openjdk8/Makefile:1.43
--- pkgsrc/lang/openjdk8/Makefile:1.42  Thu Oct 27 13:06:42 2016
+++ pkgsrc/lang/openjdk8/Makefile       Thu Dec 15 23:56:53 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2016/10/27 13:06:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2016/12/15 23:56:53 joerg Exp $
 
 DISTNAME=      openjdk-1.8.112-20161027
 PKGNAME=       openjdk8-1.8.112
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.xz
Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.42 pkgsrc/lang/openjdk8/distinfo:1.43
--- pkgsrc/lang/openjdk8/distinfo:1.42  Sun Dec 11 15:45:53 2016
+++ pkgsrc/lang/openjdk8/distinfo       Thu Dec 15 23:56:53 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2016/12/11 15:45:53 ryoon Exp $
+$NetBSD: distinfo,v 1.43 2016/12/15 23:56:53 joerg Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -92,10 +92,16 @@ SHA1 (patch-hotspot_src_os_solaris_dtrac
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e
 SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05
+SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = c0077a7691ce2ba698f46d9fc8c81bf974aef68c
+SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp) = b2bb8e74e43099fa9d1e157400bbb78386281235
+SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08
+SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509
 SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329
+SHA1 (patch-hotspot_src_share_vm_opto_lcm.cpp) = a5ffd0c6e5dedade3438df017eae5415f6bc69bf
 SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
 SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
+SHA1 (patch-hotspot_src_share_vm_runtime_virtualspace.cpp) = b5d77a6b50ecbe6724c694d8e4bec67020b8e1d2
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
 SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7

Added files:

Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp:1.1
--- /dev/null   Thu Dec 15 23:56:53 2016
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp   Thu Dec 15 23:56:53 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-hotspot_src_share_vm_classfile_symbolTable.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
+
+Static member variables of templates must be defined. C++11 inline
+definitions would be an alternative.
+
+--- hotspot/src/share/vm/classfile/symbolTable.cpp.orig        2016-12-10 16:08:22.000287424 +0000
++++ hotspot/src/share/vm/classfile/symbolTable.cpp
+@@ -42,6 +42,8 @@
+ 
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+ 
++template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
++
+ // --------------------------------------------------------------------------
+ 
+ // the number of buckets a thread claims
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp:1.1
--- /dev/null   Thu Dec 15 23:56:53 2016
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp Thu Dec 15 23:56:53 2016
@@ -0,0 +1,17 @@
+$NetBSD: patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
+
+Static member variables of templates must be defined. C++11 inline
+definitions would be an alternative.
+
+--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.orig       2016-12-10 16:01:00.232060787 +0000
++++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+@@ -48,6 +48,9 @@
+ //// CompactibleFreeListSpace
+ /////////////////////////////////////////////////////////////////////////
+ 
++template <class Chunk_t, class FreeList_t>
++size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t,  FreeList_t>)/HeapWordSize;
++
+ // highest ranked  free list lock rank
+ int CompactibleFreeListSpace::_lockRank = Mutex::leaf + 3;
+ 
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp:1.1
--- /dev/null   Thu Dec 15 23:56:53 2016
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp     Thu Dec 15 23:56:53 2016
@@ -0,0 +1,19 @@
+$NetBSD: patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
+
+defined() is not evaluated inside macros when used later.
+
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.orig   2016-12-10 15:50:21.837559173 +0000
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
+@@ -35,7 +35,11 @@ typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> 
+ // HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which
+ // asserts are compiled in.
+ #ifndef HEAP_REGION_SET_FORCE_VERIFY
+-#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT)
++#  if defined(ASSERT)
++#  define HEAP_REGION_SET_FORCE_VERIFY 1
++#  else
++#  define HEAP_REGION_SET_FORCE_VERIFY 0
++#  endif
+ #endif // HEAP_REGION_SET_FORCE_VERIFY
+ 
+ class hrs_ext_msg;
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp:1.1
--- /dev/null   Thu Dec 15 23:56:53 2016
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp        Thu Dec 15 23:56:53 2016
@@ -0,0 +1,17 @@
+$NetBSD: patch-hotspot_src_share_vm_memory_metaspace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
+
+Static member variables of templates must be defined. C++11 inline
+definitions would be an alternative.
+
+--- hotspot/src/share/vm/memory/metaspace.cpp.orig     2016-12-10 16:06:04.248447262 +0000
++++ hotspot/src/share/vm/memory/metaspace.cpp
+@@ -50,6 +50,9 @@
+ 
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+ 
++template <class Chunk_t, class FreeList_t>
++size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t,  FreeList_t>)/HeapWordSize;
++
+ typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > BlockTreeDictionary;
+ typedef BinaryTreeDictionary<Metachunk, FreeList<Metachunk> > ChunkTreeDictionary;
+ 
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp:1.1
--- /dev/null   Thu Dec 15 23:56:53 2016
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp        Thu Dec 15 23:56:53 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-hotspot_src_share_vm_opto_lcm.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
+
+Pointers are not ordered relative to 0.
+
+--- hotspot/src/share/vm/opto/lcm.cpp.orig     2016-12-10 16:03:32.851968675 +0000
++++ hotspot/src/share/vm/opto/lcm.cpp
+@@ -49,7 +49,7 @@
+ // Check whether val is not-null-decoded compressed oop,
+ // i.e. will grab into the base of the heap if it represents NULL.
+ static bool accesses_heap_base_zone(Node *val) {
+-  if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
++  if (Universe::narrow_oop_base()) { // Implies UseCompressedOops.
+     if (val && val->is_Mach()) {
+       if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
+         // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp:1.1
--- /dev/null   Thu Dec 15 23:56:53 2016
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp    Thu Dec 15 23:56:53 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-hotspot_src_share_vm_runtime_virtualspace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
+
+Pointers are not ordered relative to 0.
+
+--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig 2016-12-10 16:09:08.597267563 +0000
++++ hotspot/src/share/vm/runtime/virtualspace.cpp
+@@ -342,7 +342,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz
+                 (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
+                  Universe::narrow_oop_use_implicit_null_checks()) ?
+                   lcm(os::vm_page_size(), alignment) : 0) {
+-  if (base() > 0) {
++  if (base()) {
+     MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
+   }
+

Prev by Date: CVS commit: pkgsrc/games/scummvm-tools
Next by Date: CVS commit: pkgsrc/devel/SOPE
Previous by Thread: CVS commit: pkgsrc/games/scummvm-tools
Next by Thread: CVS commit: pkgsrc/devel/SOPE
Indexes:

Home | Main Index | Thread Index | Old Index