amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk10: Add patches to fix build.

Browse source 
* 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.
This commit is contained in:
Andreas Enge 2023-04-05 15:50:24 +02:00
parent b7c8a69fd8
commit a0cf2bb5f1
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
4 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/patches/openjdk-10-setsignalhandler.patch Normal file
View file

@ -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,