CVS commit: pkgsrc/lang/openjdk8

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/openjdk8
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Mon, 20 Aug 2018 17:24:01 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug 20 17:24:01 UTC 2018

Modified Files:
        pkgsrc/lang/openjdk8: Makefile distinfo
Added Files:
        pkgsrc/lang/openjdk8/patches:
            patch-hotspot_src_share_vm_services_mallocSiteTable.hpp
            patch-hotspot_src_share_vm_services_memTracker.cpp
            patch-hotspot_src_share_vm_services_memTracker.hpp
            patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp
            patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp
            patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp
            patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp

Log Message:
openjdk8: apply upstream changeset be59128afb76 (fixes SEGV w/ clang>=6)


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_mallocSiteTable.hpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.cpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.hpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp

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.68 pkgsrc/lang/openjdk8/Makefile:1.69
--- pkgsrc/lang/openjdk8/Makefile:1.68  Mon Aug 20 16:59:34 2018
+++ pkgsrc/lang/openjdk8/Makefile       Mon Aug 20 17:24:00 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2018/08/20 16:59:34 tnn Exp $
+# $NetBSD: Makefile,v 1.69 2018/08/20 17:24:00 tnn Exp $
 
 DISTNAME=      openjdk-1.8.172-20180527
 PKGNAME=       openjdk8-1.8.172
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.xz
@@ -114,9 +115,8 @@ MAKE_ENV+=  USE_GCC=1
 MAKE_ENV+=     ARCH_DATA_MODEL=${ABI:Q}
 .endif
 
-BUILDLINK_TRANSFORM+=  rm:-O2
-
 .if !empty(PKGSRC_COMPILER:Mclang)
+MAKE_ENV+=             USE_CLANG=true
 _WRAP_EXTRA_ARGS.CC+=  -Wno-return-type
 CWRAPPERS_APPEND.cc+=  -Wno-return-type
 _WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \

Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.57 pkgsrc/lang/openjdk8/distinfo:1.58
--- pkgsrc/lang/openjdk8/distinfo:1.57  Tue Jul 24 12:58:45 2018
+++ pkgsrc/lang/openjdk8/distinfo       Mon Aug 20 17:24:00 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2018/07/24 12:58:45 jperkin Exp $
+$NetBSD: distinfo,v 1.58 2018/08/20 17:24:00 tnn 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
@@ -103,8 +103,15 @@ SHA1 (patch-hotspot_src_share_vm_oops_kl
 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_services_mallocSiteTable.hpp) = d0d8b8023d89c5cf6216d578478f5ed76a00740e
+SHA1 (patch-hotspot_src_share_vm_services_memTracker.cpp) = 8bd31a59a2514b99db2bb25b26bce54bd94a012e
+SHA1 (patch-hotspot_src_share_vm_services_memTracker.hpp) = 40239944a15cf5ef40a00bb5dd7078f412daca8e
+SHA1 (patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp) = 3bccafe6fb16029a065d74ea0b75a1541ee049d6
+SHA1 (patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp) = 8451d864668d7d78e148f684b4da46763f59a2b9
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
+SHA1 (patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp) = bfda35cac1f44eeededa2e26747f1439fea34e8e
+SHA1 (patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp) = e3d2aa1a98d7fc6e6a797cde3efbcf61fea03a27
 SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
 SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 1a8807595c5774fc6ecfc7caa3b53b806cc9537b
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5

Added files:

Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_mallocSiteTable.hpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_mallocSiteTable.hpp:1.1
--- /dev/null   Mon Aug 20 17:24:01 2018
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_mallocSiteTable.hpp        Mon Aug 20 17:24:00 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-hotspot_src_share_vm_services_mallocSiteTable.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
+
+clang>6 fixes.
+Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
+
+--- hotspot/src/share/vm/services/mallocSiteTable.hpp.orig     2018-05-26 23:58:31.000000000 +0000
++++ hotspot/src/share/vm/services/mallocSiteTable.hpp
+@@ -42,7 +42,7 @@ class MallocSite : public AllocationSite
+ 
+  public:
+   MallocSite() :
+-    AllocationSite<MemoryCounter>(NativeCallStack::EMPTY_STACK), _flags(mtNone) {}
++    AllocationSite<MemoryCounter>(NativeCallStack::EMPTY_STACK()), _flags(mtNone) {}
+ 
+   MallocSite(const NativeCallStack& stack, MEMFLAGS flags) :
+     AllocationSite<MemoryCounter>(stack), _flags(flags) {}
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.cpp:1.1
--- /dev/null   Mon Aug 20 17:24:01 2018
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.cpp     Mon Aug 20 17:24:00 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-hotspot_src_share_vm_services_memTracker.cpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
+
+clang>6 fixes.
+Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
+
+--- hotspot/src/share/vm/services/memTracker.cpp.orig  2018-05-26 23:58:31.000000000 +0000
++++ hotspot/src/share/vm/services/memTracker.cpp
+@@ -67,10 +67,6 @@ NMT_TrackingLevel MemTracker::init_track
+     os::unsetenv(buf);
+   }
+ 
+-  // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice,
+-  // but it is benign, the results are the same.
+-  ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false);
+-
+   if (!MallocTracker::initialize(level) ||
+       !VirtualMemoryTracker::initialize(level)) {
+     level = NMT_off;
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.hpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.hpp:1.1
--- /dev/null   Mon Aug 20 17:24:01 2018
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_memTracker.hpp     Mon Aug 20 17:24:00 2018
@@ -0,0 +1,30 @@
+$NetBSD: patch-hotspot_src_share_vm_services_memTracker.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
+
+clang>6 fixes.
+Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
+
+--- hotspot/src/share/vm/services/memTracker.hpp.orig  2018-05-26 23:58:31.000000000 +0000
++++ hotspot/src/share/vm/services/memTracker.hpp
+@@ -31,8 +31,8 @@
+ 
+ #if !INCLUDE_NMT
+ 
+-#define CURRENT_PC   NativeCallStack::EMPTY_STACK
+-#define CALLER_PC    NativeCallStack::EMPTY_STACK
++#define CURRENT_PC   NativeCallStack::EMPTY_STACK()
++#define CALLER_PC    NativeCallStack::EMPTY_STACK()
+ 
+ class Tracker : public StackObj {
+  public:
+@@ -83,9 +83,9 @@ class MemTracker : AllStatic {
+ extern volatile bool NMT_stack_walkable;
+ 
+ #define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \
+-                    NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK)
++                    NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK())
+ #define CALLER_PC  ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ?  \
+-                    NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK)
++                    NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK())
+ 
+ class MemBaseline;
+ class Mutex;
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp:1.1
--- /dev/null   Mon Aug 20 17:24:01 2018
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp   Mon Aug 20 17:24:00 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-hotspot_src_share_vm_services_virtualMemoryTracker.cpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
+
+clang>6 fixes.
+Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
+
+--- hotspot/src/share/vm/services/virtualMemoryTracker.cpp.orig        2018-05-26 23:58:31.000000000 +0000
++++ hotspot/src/share/vm/services/virtualMemoryTracker.cpp
+@@ -167,7 +167,7 @@ bool ReservedMemoryRegion::remove_uncomm
+           // higher part
+           address high_base = addr + sz;
+           size_t  high_size = top - high_base;
+-          CommittedMemoryRegion high_rgn(high_base, high_size, NativeCallStack::EMPTY_STACK);
++          CommittedMemoryRegion high_rgn(high_base, high_size, NativeCallStack::EMPTY_STACK());
+           return add_committed_region(high_rgn);
+         } else {
+           return false;
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp:1.1
--- /dev/null   Mon Aug 20 17:24:01 2018
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp   Mon Aug 20 17:24:00 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-hotspot_src_share_vm_services_virtualMemoryTracker.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
+
+clang>6 fixes.
+Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
+
+--- hotspot/src/share/vm/services/virtualMemoryTracker.hpp.orig        2018-05-26 23:58:31.000000000 +0000
++++ hotspot/src/share/vm/services/virtualMemoryTracker.hpp
+@@ -305,7 +305,7 @@ class ReservedMemoryRegion : public Virt
+ 
+ 
+   ReservedMemoryRegion(address base, size_t size) :
+-    VirtualMemoryRegion(base, size), _stack(NativeCallStack::EMPTY_STACK), _flag(mtNone),
++    VirtualMemoryRegion(base, size), _stack(NativeCallStack::EMPTY_STACK()), _flag(mtNone),
+     _all_committed(false) { }
+ 
+   // Copy constructor
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp:1.1
--- /dev/null   Mon Aug 20 17:24:01 2018
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp       Mon Aug 20 17:24:00 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-hotspot_src_share_vm_utilities_nativeCallStack.cpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
+
+clang>6 fixes.
+Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
+
+--- hotspot/src/share/vm/utilities/nativeCallStack.cpp.orig    2018-05-26 23:58:31.000000000 +0000
++++ hotspot/src/share/vm/utilities/nativeCallStack.cpp
+@@ -27,7 +27,10 @@
+ #include "utilities/globalDefinitions.hpp"
+ #include "utilities/nativeCallStack.hpp"
+ 
+-const NativeCallStack NativeCallStack::EMPTY_STACK(0, false);
++const NativeCallStack& NativeCallStack::EMPTY_STACK() {
++  static const NativeCallStack empty(0, false);
++  return empty;
++}
+ 
+ NativeCallStack::NativeCallStack(int toSkip, bool fillStack) :
+   _hash_value(0) {
Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp:1.1
--- /dev/null   Mon Aug 20 17:24:01 2018
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp       Mon Aug 20 17:24:00 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-hotspot_src_share_vm_utilities_nativeCallStack.hpp,v 1.1 2018/08/20 17:24:00 tnn Exp $
+
+clang>6 fixes.
+Ref: http://mail.openjdk.java.net/pipermail/bsd-port-dev/2018-May/003177.html
+
+--- hotspot/src/share/vm/utilities/nativeCallStack.hpp.orig    2018-05-26 23:58:31.000000000 +0000
++++ hotspot/src/share/vm/utilities/nativeCallStack.hpp
+@@ -53,7 +53,7 @@
+  */
+ class NativeCallStack : public StackObj {
+  public:
+-  static const NativeCallStack EMPTY_STACK;
++  static const NativeCallStack& EMPTY_STACK();
+ 
+  private:
+   address   _stack[NMT_TrackingStackDepth];

Prev by Date: CVS commit: pkgsrc/lang
Next by Date: CVS commit: pkgsrc/lang/ocaml
Previous by Thread: CVS commit: pkgsrc/lang
Next by Thread: CVS commit: pkgsrc/lang/ocaml
Indexes:

Home | Main Index | Thread Index | Old Index