diff options
| author | nia <nia@pkgsrc.org> | 2022-09-24 09:51:54 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-09-24 09:51:54 +0000 |
| commit | e2cdfaa459f12f2ffc9e8d457853d22bfb8028da (patch) | |
| tree | 17551bc4fe4e1cd251f7e9af57c19a64075a12dd /lang | |
| parent | 3c83f873469cdc1daa3578593b3249ed50a5b657 (diff) | |
| download | pkgsrc-e2cdfaa459f12f2ffc9e8d457853d22bfb8028da.tar.gz | |
openjdk8: attempt to work around build failure on aarch64
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk8/distinfo | 3 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index 4a81e0075c2..1afca324060 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -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_bytes__bsd__aarch64.inline.hpp) 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 --git a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp new file mode 100644 index 00000000000..80d1fde7199 --- /dev/null +++ b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp @@ -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 |