Update to aarch64-shenandoah-jdk8u201-b13.
Drop JDK-8160748 & JDK-8189170 AArch64 patches now applied upstream.
This commit is contained in:
Andrew Hughes
parent
37a4ca2b33
commit
6acda86f24
1
.gitignore
vendored
1
.gitignore
vendored
@ -132,3 +132,4 @@
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u192-b12.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u201-b09.tar.xz
|
||||
/tapsets-icedtea-3.11.0.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u201-b13.tar.xz
|
||||
|
||||
@ -226,7 +226,7 @@
|
||||
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
||||
%global shenandoah_project aarch64-port
|
||||
%global shenandoah_repo jdk8u-shenandoah
|
||||
%global shenandoah_revision aarch64-shenandoah-jdk8u201-b09
|
||||
%global shenandoah_revision aarch64-shenandoah-jdk8u201-b13
|
||||
# Define old aarch64/jdk8u tree variables for compatibility
|
||||
%global project %{shenandoah_project}
|
||||
%global repo %{shenandoah_repo}
|
||||
@ -981,7 +981,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}.%{buildver}
|
||||
Release: 8%{?dist}
|
||||
Release: 0%{?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
|
||||
@ -1134,10 +1134,6 @@ Patch103: pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_
|
||||
Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
|
||||
# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
|
||||
Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
|
||||
# AArch64: JDK-8160748: [AArch64] Inconsistent types for ideal_reg
|
||||
Patch107: jdk8160748-aarch64_ideal_reg.patch
|
||||
# AArch64: JDK-8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
|
||||
Patch108: jdk8189170-aarch64_primordial_thread.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1619,8 +1615,6 @@ sh %{SOURCE12}
|
||||
|
||||
# AArch64 fixes
|
||||
%patch106
|
||||
%patch107
|
||||
%patch108
|
||||
|
||||
# x86 fixes
|
||||
%patch105
|
||||
@ -2337,6 +2331,10 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Apr 04 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.201.b13-0
|
||||
- Update to aarch64-shenandoah-jdk8u201-b13.
|
||||
- Drop JDK-8160748 & JDK-8189170 AArch64 patches now applied upstream.
|
||||
|
||||
* Fri Mar 29 2019 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.201.b09-8
|
||||
- Sync SystemTap & desktop files with upstream IcedTea release using new script
|
||||
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User kbarrett
|
||||
# Date 1547614745 0
|
||||
# Wed Jan 16 04:59:05 2019 +0000
|
||||
# Node ID bca8195a3bc70df281a73d9a40032c673971676c
|
||||
# Parent 09abae195e9a7e134a1cfd9b375a6f4d95091de7
|
||||
8160748: [AArch64] Inconsistent types for ideal_reg
|
||||
Summary: Made ideal_reg consistently uint.
|
||||
Reviewed-by: kvn, iveresov
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
|
||||
--- openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad
|
||||
+++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
|
||||
@@ -1,6 +1,6 @@
|
||||
//
|
||||
+// Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
// Copyright (c) 2013, Red Hat Inc.
|
||||
-// Copyright (c) 2003, 2012, Oracle and/or its affiliates.
|
||||
// All rights reserved.
|
||||
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
//
|
||||
@@ -3449,7 +3449,7 @@
|
||||
}
|
||||
|
||||
// Vector ideal reg.
|
||||
-const int Matcher::vector_ideal_reg(int len) {
|
||||
+const uint Matcher::vector_ideal_reg(int len) {
|
||||
switch(len) {
|
||||
case 8: return Op_VecD;
|
||||
case 16: return Op_VecX;
|
||||
@@ -3458,7 +3458,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-const int Matcher::vector_shift_count_ideal_reg(int size) {
|
||||
+const uint Matcher::vector_shift_count_ideal_reg(int size) {
|
||||
return Op_VecX;
|
||||
}
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User dbuck
|
||||
# Date 1547622839 0
|
||||
# Wed Jan 16 07:13:59 2019 +0000
|
||||
# Node ID 34c6b4b813caf9b3a6fd1859596a87a24a49c423
|
||||
# Parent bca8195a3bc70df281a73d9a40032c673971676c
|
||||
8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for use with JNI_CreateJavaJVM
|
||||
Reviewed-by: dcubed
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 1999, 2011, 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
|
||||
@@ -550,8 +550,8 @@
|
||||
// pthread_attr_getstack()
|
||||
|
||||
static void current_stack_region(address * bottom, size_t * size) {
|
||||
- if (os::Linux::is_initial_thread()) {
|
||||
- // initial thread needs special handling because pthread_getattr_np()
|
||||
+ if (os::is_primordial_thread()) {
|
||||
+ // primordial thread needs special handling because pthread_getattr_np()
|
||||
// may return bogus value.
|
||||
*bottom = os::Linux::initial_thread_stack_bottom();
|
||||
*size = os::Linux::initial_thread_stack_size();
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
|
||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u201-b09.tar.xz) = dc132d100488aa4f8a98baeb7aeba13820e62c96062a6ef7f9b69269a1a928bf1dec05b8f0e6aa40177a1f3d60ae15bbb94e7be46293b9c555893d03747fbf82
|
||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u201-b13.tar.xz) = d7191695ed8f034ceae973bfa065f8fa7f92d17977903d7a8e75dcd04b159ce1157e3033aabbef446604f63da428dc5d4990016639f85b3e62724522526ea390
|
||||
|
||||
Loading…
Reference in New Issue
Block a user