From 955fae9c340f9fda8a565661013a440a9557346f Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Fri, 23 Jul 2021 12:18:23 +0000
Subject: openjdk8: Fix build on SunOS.

---
 lang/openjdk8/distinfo                             |  4 +++-
 ...cpu_solaris__x86_vm_os__solaris__x86.inline.hpp | 23 ++++++++++++++++++++++
 .../patch-hotspot_src_share_vm_runtime_os.cpp      | 15 ++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 lang/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp
 create mode 100644 lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_os.cpp

(limited to 'lang')

diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index f778fb9445e..296b06c6060 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.84 2021/06/28 15:53:57 tnn Exp $
+$NetBSD: distinfo,v 1.85 2021/07/23 12:18:23 jperkin 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
@@ -77,6 +77,7 @@ SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d
+SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp) = a0feebbe796ab6aeddb18cfaa829888f0e99dbd3
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 92377183e9b9f232dfd7161bf37a8856441f3977
 SHA1 (patch-hotspot_src_os_bsd_vm_jsig.c) = 55f9f232f886ee57cd327639768c91c69d0c12c2
 SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = b56cfc0abb53f9ec79005d9169566aadeecc51e7
@@ -93,6 +94,7 @@ SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a54
 SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 35484c16c7ff1ce57b78c1c0fafa0dfcc7f0072a
 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_os.cpp) = f4ac9e8b00459a421412a11617b54f93c02d408b
 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
diff --git a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp
new file mode 100644
index 00000000000..72a53fc573f
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp,v 1.1 2021/07/23 12:18:23 jperkin Exp $
+
+Support GCC.
+
+--- hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp.orig	2021-05-14 21:52:06.000000000 +0000
++++ hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp
+@@ -27,8 +27,16 @@
+ 
+ #include "runtime/os.hpp"
+ 
++#ifdef _GNU_SOURCE
++inline jlong os::rdtsc() {
++  uint64_t res;
++  __asm__ __volatile__ ("rdtsc" : "=A" (res));
++  return (jlong)res;
++}
++#else
+ extern "C" jlong _raw_rdtsc(); // In .il file
+ 
+ inline jlong os::rdtsc() { return _raw_rdtsc(); }
++#endif
+ 
+ #endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_os.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_os.cpp
new file mode 100644
index 00000000000..8fc1f112ab7
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_runtime_os.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-hotspot_src_share_vm_runtime_os.cpp,v 1.1 2021/07/23 12:18:23 jperkin Exp $
+
+SunOS does not have tm_gmtoff.
+
+--- hotspot/src/share/vm/runtime/os.cpp.orig	2021-05-14 21:52:06.000000000 +0000
++++ hotspot/src/share/vm/runtime/os.cpp
+@@ -148,7 +148,7 @@ char* os::iso8601_time(char* buffer, siz
+   const time_t seconds_per_hour = seconds_per_minute * minutes_per_hour;
+ 
+   time_t UTC_to_local = 0;
+-#if defined(_ALLBSD_SOURCE) || defined(_GNU_SOURCE)
++#if (defined(_ALLBSD_SOURCE) || defined(_GNU_SOURCE)) && !defined(__sun)
+     UTC_to_local = -(time_struct.tm_gmtoff);
+ #elif defined(_WINDOWS)
+   long zone;
-- 
cgit v1.2.3