CVS commit: pkgsrc/lang/openjdk17

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May 14 15:23:03 UTC 2022

Modified Files:
        pkgsrc/lang/openjdk17: distinfo
Added Files:
        pkgsrc/lang/openjdk17/patches:
            patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.hpp
            patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp

Log Message:
openjdk17: add back some patches upstreamed in openjdk11 but not openjdk17


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.hpp \
    pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.2 pkgsrc/lang/openjdk17/distinfo:1.3
--- pkgsrc/lang/openjdk17/distinfo:1.2  Sat May 14 12:02:56 2022
+++ pkgsrc/lang/openjdk17/distinfo      Sat May 14 15:23:02 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2022/05/14 12:02:56 tnn Exp $
+$NetBSD: distinfo,v 1.3 2022/05/14 15:23:02 tnn Exp $
 
 BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = afd8e5dcbfa3d8fe397e97f713d24a1437936dcffbe79f3f0c3e9bfb58bce36d
 SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = f9ddd27ac0ccf77eb72e2c1fe5a06c6431a74b4feeea495233cba058dd8346f215861c59b5228e33729dccdc7f557a29e881123d8592f0cc304536fd5cc3609a
@@ -20,6 +20,8 @@ SHA1 (patch-make_autoconf_lib-x11.m4) = 
 SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 3172d8d76e0e79b127605429fb70dccd164b33c8
 SHA1 (patch-make_lib_Awt2dLibraries.gmk) = d69fa8c5cab173be2f41cfbd6479dad60a6337db
+SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.hpp) = 9748f3c6efeb96fb3654965bbe1f005dbd64f778
+SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp) = 33d53951a3f80a2a4c0f62717cf72b93711a4fc5
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 0a772045ad967cbd0a1342d124c47927f4a57bfe
 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = b70e14728e426a9f79c2c1ee735849fb53dfc1bd
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = a58d5eb59181d68d46272e15d47b94c6790ed00a

Added files:

Index: pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.hpp
diff -u /dev/null pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.hpp:1.1
--- /dev/null   Sat May 14 15:23:03 2022
+++ pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.hpp        Sat May 14 15:23:02 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.hpp,v 1.1 2022/05/14 15:23:02 tnn Exp $
+
+NetBSD/evbarm support
+
+--- src/hotspot/os_cpu/bsd_aarch64/bytes_bsd_aarch64.hpp.orig  2022-04-23 02:25:56.000000000 +0000
++++ src/hotspot/os_cpu/bsd_aarch64/bytes_bsd_aarch64.hpp
+@@ -34,6 +34,10 @@
+   #define bswap_16(x) swap16(x)
+   #define bswap_32(x) swap32(x)
+   #define bswap_64(x) swap64(x)
++#elif defined(__NetBSD__)
++  #define bswap_16(x) bswap16(x)
++  #define bswap_32(x) bswap32(x)
++  #define bswap_64(x) bswap64(x)
+ #elif defined(__APPLE__)
+ #include <libkern/OSByteOrder.h>
+ #  define bswap_16(x) OSSwapInt16(x)
Index: pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp
diff -u /dev/null pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp:1.1
--- /dev/null   Sat May 14 15:23:03 2022
+++ pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp   Sat May 14 15:23:02 2022
@@ -0,0 +1,70 @@
+$NetBSD: patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp,v 1.1 2022/05/14 15:23:02 tnn Exp $
+
+NetBSD/evbarm support
+
+--- src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp.orig     2022-04-23 02:25:56.000000000 +0000
++++ src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+@@ -658,6 +658,8 @@ address os::Posix::ucontext_get_pc(const
+   return (address)uc->uc_mcontext.mc_gpregs.gp_elr;
+ #elif defined(__OpenBSD__)
+   return (address)uc->sc_elr;
++#elif defined(__NetBSD__)
++  return (address)uc->uc_mcontext.__gregs[_REG_ELR];
+ #endif
+ }
+ 
+@@ -666,6 +668,8 @@ void os::Posix::ucontext_set_pc(ucontext
+   uc->uc_mcontext.mc_gpregs.gp_elr = (intptr_t)pc;
+ #elif defined(__OpenBSD__)
+   uc->sc_elr = (unsigned long)pc;
++#elif defined(__NetBSD__)
++  uc->uc_mcontext.__gregs[_REG_ELR] = (__greg_t)pc;
+ #endif
+ }
+ 
+@@ -674,6 +678,8 @@ intptr_t* os::Bsd::ucontext_get_sp(const
+   return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_sp;
+ #elif defined(__OpenBSD__)
+   return (intptr_t*)uc->sc_sp;
++#elif defined(__NetBSD__)
++  return (intptr_t*)uc->uc_mcontext.__gregs[_REG_SP];
+ #endif
+ }
+ 
+@@ -682,6 +688,8 @@ intptr_t* os::Bsd::ucontext_get_fp(const
+   return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_x[REG_FP];
+ #elif defined(__OpenBSD__)
+   return (intptr_t*)uc->sc_x[REG_FP];
++#elif defined(__NetBSD__)
++  return (intptr_t*)uc->uc_mcontext.__gregs[_REG_FP];
+ #endif
+ }
+ 
+@@ -724,6 +732,9 @@ frame os::fetch_compiled_frame_from_cont
+ #elif defined(__OpenBSD__)
+       address pc = (address)(uc->sc_lr
+                          - NativeInstruction::instruction_size);
++#elif defined(__NetBSD__)
++      address pc = (address)(uc->uc_mcontext.__gregs[_REG_LR]
++                         - NativeInstruction::instruction_size);
+ #endif
+   return frame(sp, fp, pc);
+ }
+@@ -954,6 +965,8 @@ void os::print_context(outputStream *st,
+     print_location(st, uc->uc_mcontext.mc_gpregs.gp_x[r]);
+ #elif defined(__OpenBSD__)
+     print_location(st, uc->sc_x[r]);
++#elif defined(__NetBSD__)
++    print_location(st, uc->uc_mcontext.__gregs[r]);
+ #endif
+   }
+   st->cr();
+@@ -990,6 +1003,8 @@ void os::print_register_info(outputStrea
+     st->print_cr(  "R%d=" INTPTR_FORMAT, r, (uintptr_t)uc->uc_mcontext.mc_gpregs.gp_x[r]);
+ #elif defined(__OpenBSD__)
+     st->print_cr(  "R%d=" INTPTR_FORMAT, r, (uintptr_t)uc->sc_x[r]);
++#elif defined(__NetBSD__)
++    st->print_cr(  "R%d=" INTPTR_FORMAT, r, (uintptr_t)uc->uc_mcontext.__gregs[r]);
+ #endif
+   st->cr();
+ }