view patches/hotspot/aarch32/pr1869.patch @ 2986:2ba4051a8442

Bump shenandoah to aarch64-shenandoah-jdk8u282-b08. 2021-02-03 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump shenandoah to aarch64-shenandoah-jdk8u282-b08. * patches/hotspot/shenandoah/8062808-pr3548.patch, * patches/hotspot/shenandoah/8197981-pr3548.patch, * patches/hotspot/shenandoah/pr1869.patch, * patches/hotspot/shenandoah/pr3519-return_value-02.patch, * patches/hotspot/shenandoah/pr3601.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Make PR1869, 8062808/PR3548, 8197981/PR3548 and PR3601 patches AArch32 only as they are now upstream in the new Shenandoah bundle. Remove Shenandoah-only PR3519 altogether. * NEWS: Updated. * hotspot.map.in: Bump shenandoah to aarch64-shenandoah-jdk8u282-b08. * patches/hotspot/aarch32/8062808-pr3548.patch: Replace symlink to Shenandoah version with a regenerated version that does not assume PR1748 is applied first. * patches/hotspot/aarch32/8143245-pr3548.patch, * patches/hotspot/aarch32/8197981-pr3548.patch: Replace symlinks to Shenandoah versions with copies, as the Shenandoah versions have been removed. * patches/hotspot/aarch32/pr1748.patch: Replace symlink to Shenandoah version with a regenerated version that applies after JDK-8062808, but without JDK-8036122 being applied as in the Shenandoah version. * patches/hotspot/aarch32/pr1869.patch, * patches/hotspot/aarch32/pr3601.patch, * patches/hotspot/aarch32/werror.patch: Replace symlinks to Shenandoah versions with copies, as the Shenandoah versions are either removed or modified to apply against 8u282-b08. * patches/hotspot/shenandoah/8143245-pr3548.patch: Regenerated against new context in cppInterpreter_zero.cpp due to JDK-8254166. * patches/hotspot/shenandoah/pr1748.patch: Regenerated against new context in linux/makefiles/gcc.make due to JDK-8062808 being upstreamed. * patches/hotspot/shenandoah/werror.patch: Regenerated against new context in solaris/makefiles/gcc.make due to JDK-8036122.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 04 Feb 2021 06:19:03 +0000
parents patches/hotspot/shenandoah/pr1869.patch@8a52bc7c8fed
children
line wrap: on
line source

# HG changeset patch
# User andrew
# Date 1405461315 -3600
#      Tue Jul 15 22:55:15 2014 +0100
# Node ID 967ae4d849eb20b4b63c399bc3f376dfc0f9d2cc
# Parent  84854c983fd81cf1a1598f8c069a2db010abc05c
PR1869: Avoid x86 workaround when running Zero rather than a JIT
Contributed-by: Matthias Klose <doko@ubuntu.com>

diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-11 03:36:49.000000000 +0100
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-19 17:15:35.194017652 +0100
@@ -5139,7 +5139,7 @@
 
   Linux::capture_initial_stack(JavaThread::stack_size_at_create());
 
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
   workaround_expand_exec_shield_cs_limit();
 #endif
 
diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-11 03:36:49.000000000 +0100
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-19 17:15:58.329656663 +0100
@@ -890,7 +890,7 @@
  * updates (JDK-8023956).
  */
 void os::workaround_expand_exec_shield_cs_limit() {
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
   size_t page_size = os::vm_page_size();
 
   /*