[packages/openjdk9] fix build with glibc 2.34
atler
atler at pld-linux.org
Thu Jul 20 14:10:29 CEST 2023
commit e27f9dd86e0e8e86ab451e415d49fcf1a4fee663
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Jul 20 13:16:53 2023 +0200
fix build with glibc 2.34
glibc-2.34.patch | 33 +++++++++++++++++++++++++++++++++
openjdk9.spec | 2 ++
2 files changed, 35 insertions(+)
---
diff --git a/openjdk9.spec b/openjdk9.spec
index c443b1b..9591a0f 100644
--- a/openjdk9.spec
+++ b/openjdk9.spec
@@ -53,6 +53,7 @@ Patch1: make-4.3.patch
Patch2: x32.patch
Patch3: aarch64.patch
Patch4: default-assumemp.patch
+Patch5: glibc-2.34.patch
URL: http://openjdk.java.net/
BuildRequires: /usr/bin/jar
BuildRequires: alsa-lib-devel
@@ -407,6 +408,7 @@ done
%patch3 -p1
%endif
%patch4 -p1
+%patch5 -p1
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
diff --git a/glibc-2.34.patch b/glibc-2.34.patch
new file mode 100644
index 0000000..f450876
--- /dev/null
+++ b/glibc-2.34.patch
@@ -0,0 +1,33 @@
+From f77a1a156f3da9068d012d9227c7ee0fee58f571 Mon Sep 17 00:00:00 2001
+From: David Holmes <dholmes at openjdk.org>
+Date: Sun, 22 Aug 2021 01:13:27 +0000
+Subject: [PATCH] 8272472: StackGuardPages test doesn't build with glibc 2.34
+
+Reviewed-by: shade, stuefe, jiefu
+---
+ .../jtreg/runtime/StackGuardPages/exeinvoke.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
+index a46f1cef44c..50a37001fbf 100644
+--- a/hotspot/test/runtime/StackGuardPages/exeinvoke.c
++++ b/hotspot/test/runtime/StackGuardPages/exeinvoke.c
+@@ -68,8 +68,17 @@ static void handler(int sig, siginfo_t *si, void *unused) {
+ 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 = malloc(SIGSTKSZ);
++ if (altstack == NULL) {
++ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
++ exit(7);
++ }
++ }
+
+ stack_t ss = {
+ .ss_size = SIGSTKSZ,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk9.git/commitdiff/e27f9dd86e0e8e86ab451e415d49fcf1a4fee663
More information about the pld-cvs-commit
mailing list