diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-04-05 12:41:12 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-04-05 15:51:59 +0200 |
| commit | b7c8a69fd8e038990f1489c9d85def5b2cae52a8 (patch) | |
| tree | 5b0799031f6d180d6fd34939594b9bac43fddf0c /gnu/packages/patches/openjdk-9-setsignalhandler.patch | |
| parent | 413097306f2197fc8bd93ba084886a41f0e3fd52 (diff) | |
| download | guix-b7c8a69fd8e038990f1489c9d85def5b2cae52a8.tar.gz guix-b7c8a69fd8e038990f1489c9d85def5b2cae52a8.zip | |
gnu: openjdk9: Add patches to fix build.
* gnu/packages/patches/openjdk-9-pointer-comparison.patch,
gnu/packages/patches/openjdk-9-setsignalhandler.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register patches.
* gnu/packages/java.scm (openjdk9)[origin]: Use patches.
Diffstat (limited to 'gnu/packages/patches/openjdk-9-setsignalhandler.patch')
| -rw-r--r-- | gnu/packages/patches/openjdk-9-setsignalhandler.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/openjdk-9-setsignalhandler.patch b/gnu/packages/patches/openjdk-9-setsignalhandler.patch new file mode 100644 index 0000000000..500bf2360b --- /dev/null +++ b/gnu/packages/patches/openjdk-9-setsignalhandler.patch @@ -0,0 +1,24 @@ +Patch taken from file comparison with openjdk@19. + +diff -u -r openjdk-9.alt/hotspot/test/runtime/StackGuardPages/exeinvoke.c openjdk-9/hotspot/test/runtime/StackGuardPages/exeinvoke.c +--- openjdk-9.alt/hotspot/test/runtime/StackGuardPages/exeinvoke.c 2023-04-05 13:46:58.689964892 +0200 ++++ openjdk-9/hotspot/test/runtime/StackGuardPages/exeinvoke.c 2023-04-05 14:15:52.435613325 +0200 +@@ -67,8 +67,17 @@ + longjmp(context, 1); + } + ++static char* altstack = NULL; ++ + void set_signal_handler() { +- static char altstack[SIGSTKSZ]; ++ 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, |