Fix portability issues.

4 files changed, 64 insertions, 1 deletions

diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index bf3e9eed2d7..1721301c9cc 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2017/08/14 00:02:16 ryoon Exp $
+$NetBSD: distinfo,v 1.90 2017/09/04 16:00:19 joerg Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -112,10 +112,13 @@ SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
 SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 1bc67dd849eec122162b71f21d204e5489555738
+SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = cf0880b33cee7d1439347faeea2306082b49d36c
+SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = e5e00d4a7643c6b339a818dceeebf5b050492abd
 SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 8f25f2df28e4d644cd0408cc6c198d6e9d8b9155
 SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 86ba7f86ba769a444484f3c586e8b039079d2456
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
 SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b
+SHA1 (patch-hotspot_src_share_vm_runtime_virtualspace.cpp) = 56ddcfee0be132aad47feb3191377c49b2eb68e9
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 1935e8225e08870fd912737de6dee3d599d260ab
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
 SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
new file mode 100644
index 00000000000..567288a0c13
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-hotspot_src_share_vm_classfile_symbolTable.cpp,v 1.1 2017/09/04 16:00:19 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	2017-08-13 05:55:28.000000000 +0000
++++ hotspot/src/share/vm/classfile/symbolTable.cpp
+@@ -37,6 +37,9 @@
+ #include "utilities/hashtable.inline.hpp"
+ #include "utilities/numberSeq.hpp"
+ 
++template <> jint Hashtable<Symbol *, mtSymbol>::_seed = 0;
++template <> jint Hashtable<oopDesc *, mtSymbol>::_seed = 0;
++
+ // --------------------------------------------------------------------------
+ 
+ // the number of buckets a thread claims
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
new file mode 100644
index 00000000000..9ddfbc1c8f6
--- /dev/null
+++ b/lang/openjdk7/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 2017/09/04 16:00:19 joerg Exp $
+
+defined() in macros is UB.
+
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.orig	2017-09-04 13:24:02.725351260 +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
+ 
+ //////////////////// HeapRegionSetBase ////////////////////
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp
new file mode 100644
index 00000000000..092727d9223
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-hotspot_src_share_vm_runtime_virtualspace.cpp,v 1.1 2017/09/04 16:00:19 joerg Exp $
+
+Pointers are not ordered relative to 0.
+
+--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig	2017-09-04 13:40:41.223301418 +0000
++++ hotspot/src/share/vm/runtime/virtualspace.cpp
+@@ -527,7 +527,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);
+   }
+ 
+@@ -546,7 +546,7 @@ ReservedHeapSpace::ReservedHeapSpace(con
+                 (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
+                  Universe::narrow_oop_use_implicit_null_checks()) ?
+                   lcm(os::vm_page_size(), prefix_align) : 0) {
+-  if (base() > 0) {
++  if (base()) {
+     MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
+   }
+