Fix portability issues. Bump revision, since the preprocessor definition

potentially changes the package.

6 files changed, 99 insertions, 0 deletions

diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
new file mode 100644
index 00000000000..aa24f6bdedb
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
@@ -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
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
new file mode 100644
index 00000000000..fa5ee96ad80
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
@@ -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;
+ 
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
new file mode 100644
index 00000000000..55b9cc1c9b4
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
@@ -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;
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
new file mode 100644
index 00000000000..bdd361a3b86
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
@@ -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;
+ 
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp
new file mode 100644
index 00000000000..496ead847bd
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_opto_lcm.cpp
@@ -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
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp
new file mode 100644
index 00000000000..70f393d0b1f
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp
@@ -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);
+   }
+