returned patch562 rhbz_1540242.patch, added Patch563 rhbz_1536622-JDK8197429-jdk8.patch

java-1.8.0-openjdk.spec

@@ -937,7 +937,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 2.%{buildver}%{?dist}
+Release: 3.%{buildver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -1044,6 +1044,10 @@ Patch206: hotspot-assembler-debuginfo.patch
 Patch560: 8188030-pr3459-rh1484079.patch
 # 8196218, RH1538767: libfontmanager.so needs to link against headless awt library
 Patch561: rhbz_1538767_fix_linking.patch
+# fixing aarch64 segfault when boostraping after compiled by gcc8
+Patch562: rhbz_1540242.patch
+# rhbz1536622 - 32 bit java app started via JNI crashes with larger stack sizes
+Patch563: rhbz_1536622-JDK8197429-jdk8.patch
 
 # Arch-specific upstreamable patches
 # PR2415: JVM -Xmx requirement is too high on s390
@@ -1482,7 +1486,8 @@ sh %{SOURCE12}
 pushd openjdk/jdk
 %patch561 -p1
 popd
-
+%patch562
+%patch563
 
 # RPM-only fixes
 %patch525
@@ -2115,7 +2120,11 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
-* Mon Mar 26 2018 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.162-1.b12
+* Thu Mar 29 2018 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.162-3.b12
+- returned patch562 rhbz_1540242.patch
+- added Patch563 rhbz_1536622-JDK8197429-jdk8.patch
+
+* Mon Mar 26 2018 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.162-2.b12
 - Added  patch 540 rhbz1548475-LDFLAGSusage.patch to honor build flags fully
 
 * Wed Mar 21 2018 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.162-1.b12

rhbz_1536622-JDK8197429-jdk8.patch

@@ -0,0 +1,93 @@
+diff -r eecfc14e66ee src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Mon Jan 22 16:25:24 2018 +0000
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Wed Feb 21 13:52:31 2018 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2018, 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
+@@ -674,6 +674,10 @@
+   }
+ }
+ 
++void os::Linux::expand_stack_to(address bottom) {
++  _expand_stack_to(bottom);
++}
++
+ bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
+   assert(t!=NULL, "just checking");
+   assert(t->osthread()->expanding_stack(), "expand should be set");
+diff -r eecfc14e66ee src/os/linux/vm/os_linux.hpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.hpp	Mon Jan 22 16:25:24 2018 +0000
++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp	Wed Feb 21 13:52:31 2018 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2018, 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
+@@ -245,6 +245,8 @@
+   static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
+ 
+ private:
++  static void expand_stack_to(address bottom);
++
+   typedef int (*sched_getcpu_func_t)(void);
+   typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
+   typedef int (*numa_max_node_func_t)(void);
+diff -r eecfc14e66ee src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Mon Jan 22 16:25:24 2018 +0000
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Wed Feb 21 13:52:31 2018 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2018, 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
+@@ -892,6 +892,25 @@
+ void os::workaround_expand_exec_shield_cs_limit() {
+ #if defined(IA32)
+   size_t page_size = os::vm_page_size();
++
++  /*
++   * JDK-8197429
++   *
++   * Expand the stack mapping to the end of the initial stack before
++   * attempting to install the codebuf.  This is needed because newer
++   * Linux kernels impose a distance of a megabyte between stack
++   * memory and other memory regions.  If we try to install the
++   * codebuf before expanding the stack the installation will appear
++   * to succeed but we'll get a segfault later if we expand the stack
++   * in Java code.
++   *
++   */
++  if (os::Linux::is_initial_thread()) {
++    address limit = Linux::initial_thread_stack_bottom();
++    limit += (StackYellowPages + StackRedPages) * page_size;
++    os::Linux::expand_stack_to(limit);
++  }
++
+   /*
+    * Take the highest VA the OS will give us and exec
+    *
+@@ -910,6 +929,16 @@
+   char* hint = (char*) (Linux::initial_thread_stack_bottom() -
+                         ((StackYellowPages + StackRedPages + 1) * page_size));
+   char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
++
++  if (codebuf == NULL) {
++    // JDK-8197429: There may be a stack gap of one megabyte between
++    // the limit of the stack and the nearest memory region: this is a
++    // Linux kernel workaround for CVE-2017-1000364.  If we failed to
++    // map our codebuf, try again at an address one megabyte lower.
++    hint -= 1 * M;
++    codebuf = os::attempt_reserve_memory_at(page_size, hint);
++  }
++
+   if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
+     return; // No matter, we tried, best effort.
+   }

rhbz_1540242.patch

@@ -0,0 +1,22 @@
+diff --git a/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+--- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+@@ -698,6 +698,7 @@
+ 
+ extern "C" {
+   int SpinPause() {
++    return 0;
+   }
+ 
+   void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
+diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -408,6 +408,7 @@
+ 
+ extern "C" {
+   int SpinPause() {
++    return 0;
+   }
+ 
+