diff --git a/8240353.patch b/8240353.patch new file mode 100755 index 0000000000000000000000000000000000000000..74f890bbf24070d60b17401568b4b32310494460 --- /dev/null +++ b/8240353.patch @@ -0,0 +1,67 @@ +commit 29fd7a83a66269e360af353c64d945612be62623 +Author: g00357498 +Date: Thu Feb 4 16:37:53 2021 +0800 + + 8240353: AArch64: missing support for -XX:+ExtendedDTraceProbes in C1 + + DTS/AR: DTS202102040ILH2PP1F00 + Summary: : java -XX:+ExtendedDTraceProbes throws SIGILL + LLT: java -XX:+ExtendedDTraceProbes + Patch Type: backport + Bug url: https://bugs.openjdk.java.net/browse/JDK-8240353 + +diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp +index 7798aa509..a8e89cde0 100644 +--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp ++++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, Red Hat Inc. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -449,12 +449,9 @@ int LIR_Assembler::emit_unwind_handler() { + } + + if (compilation()->env()->dtrace_method_probes()) { +- __ call_Unimplemented(); +-#if 0 +- __ movptr(Address(rsp, 0), rax); +- __ mov_metadata(Address(rsp, sizeof(void*)), method()->constant_encoding()); +- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit))); +-#endif ++ __ mov(c_rarg0, rthread); ++ __ mov_metadata(c_rarg1, method()->constant_encoding()); ++ __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), c_rarg0, c_rarg1); + } + + if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) { +diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp +index 2344e0be3..3f5ab6641 100644 +--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp ++++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, Red Hat Inc. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -1123,6 +1123,16 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) { + } + break; + ++ case dtrace_object_alloc_id: ++ { // c_rarg0: object ++ StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments); ++ save_live_registers(sasm); ++ ++ __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), c_rarg0); ++ ++ restore_live_registers(sasm); ++ } ++ break; + + default: + { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments); diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index ce9ca68e9d4792e60a0e1c47490ae0d4f2a8fd5f..de685c3f58ae584c229104b0cb584be5b9f8fb8b 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 0 +Release: 1 # 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 @@ -845,6 +845,9 @@ Patch57: add-zgc-parameter-adaptation-feature.patch Patch58: add-integerCache-feature.patch Patch59: add-SVE-backend-feature.patch +#11.0.10 +Patch60: 8240353.patch + BuildRequires: autoconf BuildRequires: alsa-lib-devel BuildRequires: binutils @@ -1113,6 +1116,7 @@ pushd %{top_level_dir_name} %patch57 -p1 %patch58 -p1 %patch59 -p1 +%patch60 -p1 popd # openjdk %patch1000 @@ -1616,6 +1620,9 @@ require "copy_jdk_configs.lua" %changelog +* Thu Feb 5 2021 eapen - 1:11.0.10.9-1 +- add 8240353.patch + * Thu Feb 5 2021 eapen - 1:11.0.10.9-0 - update to 11.0.10+9(GA) - use system harfbuzz now this is supported