- upstream fix for glibc 2.34 SIGSTKSZ change, rel 3

diff --git a/glibc-2.34.patch b/glibc-2.34.patch
new file mode 100644 (file)
index 0000000..04bb926
--- /dev/null
+++ b/glibc-2.34.patch
@@ -0,0 +1,40 @@
+From f77a1a156f3da9068d012d9227c7ee0fee58f571 Mon Sep 17 00:00:00 2001
+From: David Holmes <dholmes@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/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
++++ b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -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,

diff --git a/openjdk11.spec b/openjdk11.spec
index 38968290ba495f6ebfa980b85c212ed6fa419d5a..baf8336ff1af783595a04ae0c7fea6eaa644c362 100644 (file)
--- a/openjdk11.spec
+++ b/openjdk11.spec
@@ -26,7 +26,7 @@ Summary:      Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):     Wolnoźródłowa implementacja Java 11 SE
 Name:          openjdk11
 Version:       11.0.12
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Development/Languages/Java
 Source0:       https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-%{version}-ga.tar.bz2?/%{name}-%{version}.tar.bz2
@@ -34,6 +34,7 @@ Source0:      https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-%{version}-g
 Source10:      make-cacerts.sh
 Patch0:                libpath.patch
 Patch1:                x32.patch
+Patch2:                glibc-2.34.patch
 URL:           http://openjdk.java.net/
 BuildRequires: /usr/bin/jar
 BuildRequires: alsa-lib-devel
@@ -341,6 +342,7 @@ Przykłady dla OpenJDK.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.