[pkgsrc/trunk]: pkgsrc/lang/openjdk11 openjdk11: remove icache patch, issue i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/004578ee6042
branches:  trunk
changeset: 430985:004578ee6042
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu May 07 09:09:15 2020 +0000

description:
openjdk11: remove icache patch, issue is fixed in src

diffstat:

 lang/openjdk11/distinfo                                                  |   3 +-
 lang/openjdk11/patches/patch-src_hotspot_cpu_aarch64_icache__aarch64.hpp |  29 ----------
 2 files changed, 1 insertions(+), 31 deletions(-)

diffs (50 lines):

diff -r 292e2b5101a9 -r 004578ee6042 lang/openjdk11/distinfo
--- a/lang/openjdk11/distinfo   Thu May 07 08:42:55 2020 +0000
+++ b/lang/openjdk11/distinfo   Thu May 07 09:09:15 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2020/05/04 20:48:36 tnn Exp $
+$NetBSD: distinfo,v 1.15 2020/05/07 09:09:15 tnn Exp $
 
 SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
 RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
@@ -21,7 +21,6 @@
 SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
 SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
-SHA1 (patch-src_hotspot_cpu_aarch64_icache__aarch64.hpp) = db26becc9c479c7d71b79416639dbd898346679c
 SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp) = 70cd073fcc3e84e673228754dd0fb85ce5ae7102
 SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.hpp) = 042ae280b0988c945ed96a2c20e9f1cb356d8efe
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.inline.hpp) = 4153d3a12ffc24de868b2fd97498dbdf7645e499
diff -r 292e2b5101a9 -r 004578ee6042 lang/openjdk11/patches/patch-src_hotspot_cpu_aarch64_icache__aarch64.hpp
--- a/lang/openjdk11/patches/patch-src_hotspot_cpu_aarch64_icache__aarch64.hpp  Thu May 07 08:42:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_hotspot_cpu_aarch64_icache__aarch64.hpp,v 1.1 2020/05/04 20:46:11 tnn Exp $
-
-Band-aid for bug in NetBSD's __clear_cache libc implementation.
-Always feed it ranges in multiples of full cache lines to make
-it behave more like __clear_cache on other operating systems.
-
---- src/hotspot/cpu/aarch64/icache_aarch64.hpp.orig    2020-04-15 22:35:23.000000000 +0000
-+++ src/hotspot/cpu/aarch64/icache_aarch64.hpp
-@@ -34,10 +34,19 @@ class ICache : public AbstractICache {
-  public:
-   static void initialize();
-   static void invalidate_word(address addr) {
--    __clear_cache((char *)addr, (char *)(addr + 3));
-+    invalidate_range(addr, 3);
-   }
-   static void invalidate_range(address start, int nbytes) {
-+#if defined(__NetBSD__)
-+    uint64_t ctr_el0, dc, ic, cl_mask;
-+    __asm __volatile("mrs %0, ctr_el0" : "=r"(ctr_el0));
-+    dc = (ctr_el0 & 0xf0000) >> 12;
-+    ic = (ctr_el0 & 0xf) << 4;
-+    cl_mask = ((ic > dc) ? ic : dc) - 1;
-+    __clear_cache((void *)((uintptr_t)start & ~cl_mask), (void *)(((uintptr_t)start + nbytes) | cl_mask));
-+#else
-     __clear_cache((char *)start, (char *)(start + nbytes));
-+#endif
-   }
- };
-