[pkgsrc/trunk]: pkgsrc/lang/openjdk8 openjdk8: attempt to work around build f...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a87b0b17671b
branches:  trunk
changeset: 385699:a87b0b17671b
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Sep 24 09:51:54 2022 +0000

description:
openjdk8: attempt to work around build failure on aarch64

diffstat:

 lang/openjdk8/distinfo                                                         |   3 +-
 lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp |  28 ++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)

diffs (49 lines):

diff -r 89bde1fd57f2 -r a87b0b17671b lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Sat Sep 24 09:02:57 2022 +0000
+++ b/lang/openjdk8/distinfo    Sat Sep 24 09:51:54 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.91 2022/08/15 12:23:05 tnn Exp $
+$NetBSD: distinfo,v 1.92 2022/09/24 09:51:54 nia Exp $
 
 BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 
6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
@@ -65,6 +65,7 @@
 SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 461717b25728884add18a8c68221ccea4ef81bbe
 SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_vm__version__bsd__aarch64.cpp) = d6762bb2a9fe6e158ccf23f7d04aa0cba588e78e
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46713855507654be42707b1f80a779796929069
+SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = dcce100a83519f844fe9833c93c924a00bfa4f2d
 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
diff -r 89bde1fd57f2 -r a87b0b17671b lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp    Sat Sep 24 09:51:54 2022 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.4 2022/09/24 09:51:54 nia Exp $
+
+delay evaluation of __has_builtin after the !_LP64 case, this is an attempted
+workaround for the following compiler error on aarch64:
+
+os_bsd_zero.cpp:453:38: error: missing binary operator before token "("
+ #if !defined(_LP64) && !__has_builtin(__sync_val_compare_and_swap_8)
+                                      ^
+--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig        2022-07-31 16:21:00.000000000 +0000
++++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+@@ -450,7 +450,8 @@ extern "C" {
+ // Implementations of atomic operations not supported by processors.
+ //  -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html
+ 
+-#if !defined(_LP64) && !__has_builtin(__sync_val_compare_and_swap_8)
++#if !defined(_LP64)
++#if !__has_builtin(__sync_val_compare_and_swap_8)
+ extern "C" {
+   long long unsigned int __sync_val_compare_and_swap_8(
+     volatile void *ptr,
+@@ -460,6 +461,7 @@ extern "C" {
+     return 0; // silence compiler warnings
+   }
+ };
++#endif
+ #endif // !_LP64
+ 
+ #ifndef PRODUCT