From a0cf2bb5f1d28b636574fb6b974dd7ba1ded6d2d Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Wed, 5 Apr 2023 15:50:24 +0200
Subject: gnu: openjdk10: Add patches to fix build.
* gnu/packages/patches/openjdk-10-pointer-comparison.patch,
gnu/packages/patches/openjdk-10-setsignalhandler.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register patches.
* gnu/packages/java.scm (openjdk10)[origin]: Use patches.
---
gnu/packages/java.scm | 4 +++-
.../patches/openjdk-10-pointer-comparison.patch | 14 ++++++++++++
.../patches/openjdk-10-setsignalhandler.patch | 25 ++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/openjdk-10-pointer-comparison.patch
create mode 100644 gnu/packages/patches/openjdk-10-setsignalhandler.patch
(limited to 'gnu/packages')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e8cc968544..a01309e730 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1058,7 +1058,9 @@ new Date();"))
(base32
"0i47ar8lxzjrkkiwbzybfxs473390h4jq9ahm3xqdvy5zpchxy3y"))
(patches (search-patches
- "openjdk-10-idlj-reproducibility.patch"))))
+ "openjdk-10-idlj-reproducibility.patch"
+ "openjdk-10-pointer-comparison.patch"
+ "openjdk-10-setsignalhandler.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments openjdk9)
((#:phases phases)
diff --git a/gnu/packages/patches/openjdk-10-pointer-comparison.patch b/gnu/packages/patches/openjdk-10-pointer-comparison.patch
new file mode 100644
index 0000000000..9c09f8e391
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-pointer-comparison.patch
@@ -0,0 +1,14 @@
+Patch inspired by file comparison with openjdk@19.
+
+diff -u -r openjdk-10.alt/src/hotspot/os/linux/os_linux.cpp openjdk-10/src/hotspot/os/linux/os_linux.cpp
+--- openjdk-10.alt/src/hotspot/os/linux/os_linux.cpp 2023-04-05 15:02:56.994779480 +0200
++++ openjdk-10/src/hotspot/os/linux/os_linux.cpp 2023-04-05 15:07:47.267537301 +0200
+@@ -2155,7 +2155,7 @@
+ }
+
+ p = OSContainer::cpu_cpuset_memory_nodes();
+- if (p < 0)
++ if (p == NULL)
+ st->print("cpu_memory_nodes() failed\n");
+ else {
+ st->print("cpu_memory_nodes: %s\n", p);
diff --git a/gnu/packages/patches/openjdk-10-setsignalhandler.patch b/gnu/packages/patches/openjdk-10-setsignalhandler.patch
new file mode 100644
index 0000000000..c91ae6b318
--- /dev/null
+++ b/gnu/packages/patches/openjdk-10-setsignalhandler.patch
@@ -0,0 +1,25 @@
+Patch inspired by file comparison with openjdk@19.
+
+diff -u -r openjdk-10.alt/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c openjdk-10/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
+--- openjdk-10.alt/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2023-04-05 15:03:00.070787628 +0200
++++ openjdk-10/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2023-04-05 15:29:51.379824348 +0200
+@@ -67,8 +67,17 @@
+ longjmp(context, 1);
+ }
+
+-void set_signal_handler() {
+- static char altstack[SIGSTKSZ];
++static char* altstack = NULL;
++
++ void set_signal_handler() {
++ if (altstack == NULL) {
++ // Dynamically allocated in case SIGSTKSZ is not constant
++ altstack = (char*)malloc(SIGSTKSZ);
++ if (altstack == NULL) {
++ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
++ exit(7);
++ }
++ }
+
+ stack_t ss = {
+ .ss_size = SIGSTKSZ,
--
cgit v1.2.3