moved to u72b16
This commit is contained in:
Jiri Vanek
parent
acfc6fd068
commit
cbca541ec5
1
.gitignore
vendored
1
.gitignore
vendored
@ -52,3 +52,4 @@
|
||||
/aarch64-jdk8u71-b15.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u72-b15.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u72-b15-ec.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u72-b16-ec.tar.xz
|
||||
|
||||
@ -152,7 +152,7 @@
|
||||
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
||||
%global project aarch64-port
|
||||
%global repo jdk8u
|
||||
%global revision aarch64-jdk8u72-b15
|
||||
%global revision aarch64-jdk8u72-b16
|
||||
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
|
||||
%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
|
||||
# eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
|
||||
@ -824,12 +824,10 @@ Patch102: %{name}-size_t.patch
|
||||
Patch103: s390-size_t_format_flags.patch
|
||||
|
||||
# AArch64-specific upstreamable patches
|
||||
# Revert 'Fixes to work around "missing 'client' JVM" error messages' and sync jvm.cfg with OpenJDK 9
|
||||
Patch104: remove_aarch64_jvm.cfg_divergence.patch
|
||||
# RH1300630, 8147805: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject
|
||||
Patch105: rh1300630.patch
|
||||
# Remove template in AArch64 port which causes issues with GCC 6
|
||||
Patch106: remove_aarch64_template_for_gcc6.patch
|
||||
# Remove accidentally included global large code cache changes which break S390
|
||||
Patch107: make_reservedcodecachesize_changes_aarch64_only.patch
|
||||
|
||||
# Patches which need backporting to 8u
|
||||
# S8073139, RH1191652; fix name of ppc64le architecture
|
||||
@ -1129,9 +1127,8 @@ sh %{SOURCE12}
|
||||
%patch103
|
||||
|
||||
# aarch64 build fixes
|
||||
%patch104
|
||||
%patch105
|
||||
%patch106
|
||||
%patch107
|
||||
|
||||
# Zero PPC fixes.
|
||||
%patch403
|
||||
@ -1716,6 +1713,11 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Feb 29 2016 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.72-5.b16
|
||||
- Fix regression introduced on s390 by large code cache change.
|
||||
- Update to u72b16.
|
||||
- Drop 8147805 and jvm.cfg fix which are applied upstream.
|
||||
|
||||
* Wed Feb 24 2016 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.72-11.b15
|
||||
- Add patches to allow the SunEC provider to be built with the system NSS install.
|
||||
- Re-generate source tarball so it includes ecc_impl.h.
|
||||
|
||||
15
make_reservedcodecachesize_changes_aarch64_only.patch
Normal file
15
make_reservedcodecachesize_changes_aarch64_only.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -r 4c440540c962 src/share/vm/runtime/arguments.cpp
|
||||
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Mon Feb 29 06:45:24 2016 +0000
|
||||
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Mon Feb 29 16:36:41 2016 +0000
|
||||
@@ -1137,8 +1137,9 @@
|
||||
}
|
||||
// Increase the code cache size - tiered compiles a lot more.
|
||||
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
|
||||
- FLAG_SET_DEFAULT(ReservedCodeCacheSize,
|
||||
- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
|
||||
+ NOT_AARCH64(FLAG_SET_DEFAULT(ReservedCodeCacheSize, ReservedCodeCacheSize * 5));
|
||||
+ AARCH64_ONLY(FLAG_SET_DEFAULT(ReservedCodeCacheSize,
|
||||
+ MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5)));
|
||||
}
|
||||
if (!UseInterpreter) { // -Xcomp
|
||||
Tier3InvokeNotifyFreqLog = 0;
|
||||
@ -1,48 +0,0 @@
|
||||
diff -r 57824090cf28 src/share/bin/java.c
|
||||
--- openjdk/jdk/src/share/bin/java.c Fri Feb 05 17:41:45 2016 +0000
|
||||
+++ openjdk/jdk/src/share/bin/java.c Thu Feb 18 03:43:51 2016 +0000
|
||||
@@ -699,22 +699,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-/*
|
||||
- * This is called if the jvmtype returned by CheckJvmType above
|
||||
- * didn't exist. In this case if it was the default VM and we
|
||||
- * selected the server vm we will allow it to use the client vm
|
||||
- * instead.
|
||||
- */
|
||||
-char *
|
||||
-GetAltJvmType(char *jvmtype)
|
||||
-{
|
||||
- if ((knownVMs[0].flag == VM_IF_SERVER_CLASS)) {
|
||||
- if (jvmtype == knownVMs[0].server_class+1) return knownVMs[0].name+1;
|
||||
- if (jvmtype == knownVMs[0].name+1) return knownVMs[0].server_class+1;
|
||||
- }
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
/* copied from HotSpot function "atomll()" */
|
||||
static int
|
||||
parse_size(const char *s, jlong *result) {
|
||||
diff -r 57824090cf28 src/share/bin/java.h
|
||||
--- openjdk/jdk/src/share/bin/java.h Fri Feb 05 17:41:45 2016 +0000
|
||||
+++ openjdk/jdk/src/share/bin/java.h Thu Feb 18 03:43:51 2016 +0000
|
||||
@@ -164,7 +164,6 @@
|
||||
*/
|
||||
jint ReadKnownVMs(const char *jvmcfg, jboolean speculative);
|
||||
char *CheckJvmType(int *argc, char ***argv, jboolean speculative);
|
||||
-char *GetAltJvmType(char *jvmtype);
|
||||
void AddOption(char *str, void *info);
|
||||
|
||||
enum ergo_policy {
|
||||
diff -r 57824090cf28 src/solaris/bin/aarch64/jvm.cfg
|
||||
--- openjdk/jdk/src/solaris/bin/aarch64/jvm.cfg Fri Feb 05 17:41:45 2016 +0000
|
||||
+++ openjdk/jdk/src/solaris/bin/aarch64/jvm.cfg Thu Feb 18 03:43:51 2016 +0000
|
||||
@@ -31,6 +31,5 @@
|
||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
||||
# and may not be available in a future release.
|
||||
#
|
||||
--client IF_SERVER_CLASS -server
|
||||
-server KNOWN
|
||||
--minimal KNOWN
|
||||
+-client IGNORE
|
||||
@ -1,24 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User hshi
|
||||
# Date 1455640059 0
|
||||
# Tue Feb 16 16:27:39 2016 +0000
|
||||
# Node ID f90e98d9a3e53ffa6d4611bec799d8a9b338d82c
|
||||
# Parent 225180d970c1fd447b87de8122016cdbfaea0dff
|
||||
8147805: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject
|
||||
Summary: In Aarch64 LIR_Assembler.atomic_op, keep stored data reference register in decompressed forms as it may be used later
|
||||
Reviewed-by: aph
|
||||
Contributed-by: hui.shi@linaro.org, felix.yang@linaro.org
|
||||
|
||||
diff -r 225180d970c1 -r f90e98d9a3e5 src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
|
||||
--- openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Thu Jan 21 22:17:05 2016 +0000
|
||||
+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Tue Feb 16 16:27:39 2016 +0000
|
||||
@@ -3202,7 +3202,8 @@
|
||||
Register obj = as_reg(data);
|
||||
Register dst = as_reg(dest);
|
||||
if (is_oop && UseCompressedOops) {
|
||||
- __ encode_heap_oop(obj);
|
||||
+ __ encode_heap_oop(rscratch1, obj);
|
||||
+ obj = rscratch1;
|
||||
}
|
||||
assert_different_registers(obj, addr.base(), tmp, rscratch2, dst);
|
||||
Label again;
|
||||
Loading…
Reference in New Issue
Block a user