packages/openjdk-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!404 sync master to openEuler-22.03-LTS-SP3

Browse Source 
From: @yyq-abab 
Reviewed-by: @DXwangg 
Signed-off-by: @DXwangg
This commit is contained in:
openeuler-ci-bot 2025-04-23 04:27:35 +00:00 committed by Gitee
commit df138342f3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 95149 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
View File

@ -367,4 +367,4 @@ index 000000000..85b49171c
--- /dev/null
+++ b/version.txt
@@ -0,0 +1 @@
+11.0.26.0.13
+11.0.27.0.13

6234
add-jbolt-feature.patch Normal file
View File

File diff suppressed because it is too large Load Diff

88728
add-sw_64-support.patch Normal file
View File

File diff suppressed because it is too large Load Diff

129
fix-potential-build-fail-in-jbolt.patch Normal file
View File

@ -0,0 +1,129 @@
From d84a998248d3403e093ec14abf2daf3e1bd8dd25 Mon Sep 17 00:00:00 2001
Subject: fix potential build fail in jbolt
---
make/hotspot/lib/JvmFeatures.gmk | 2 ++
src/hotspot/os/linux/os_linux.cpp | 5 +++++
src/hotspot/share/ci/ciEnv.cpp | 2 ++
src/hotspot/share/jbolt/jBoltDcmds.cpp | 9 +++++++--
src/hotspot/share/jfr/periodic/jfrPeriodic.cpp | 2 ++
src/hotspot/share/runtime/sweeper.cpp | 2 +-
src/hotspot/share/utilities/macros.hpp | 3 +++
7 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index 7b86f83cc..55bd4ebd1 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -174,6 +174,8 @@ endif
ifneq ($(call check-jvm-feature, jfr), true)
JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
JVM_EXCLUDE_PATTERNS += jfr
+ JVM_CFLAGS_FEATURES += -DINCLUDE_JBOLT=0
+ JVM_EXCLUDE_PATTERNS += jbolt
endif
################################################################################
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 0acc6a57f..52f65baba 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -5703,6 +5703,11 @@ void os::Linux::load_plugin_library() {
}
#endif // INCLUDE_JBOLT
}
+
+ JBOLT_ONLY(log_debug(jbolt)("Plugin library for JBolt: %s %s %s %s", BOOL_TO_STR(_jboltHeap_init != NULL),
+ BOOL_TO_STR(_jboltLog_precalc != NULL),
+ BOOL_TO_STR(_jboltLog_do != NULL),
+ BOOL_TO_STR(_jboltMerge_judge != NULL));)
}
// this is called _after_ the global arguments have been parsed
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index f66926600..5a71a567e 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1048,7 +1048,9 @@ void ciEnv::register_method(ciMethod* target,
frame_words, oop_map_set,
handler_table, inc_table,
compiler, task()->comp_level(),
+#if INCLUDE_JVMCI
NULL, NULL,
+#endif
code_blob_type);
} else
#endif // INCLUDE_JBOLT
diff --git a/src/hotspot/share/jbolt/jBoltDcmds.cpp b/src/hotspot/share/jbolt/jBoltDcmds.cpp
index 249a98001..d57eea39b 100644
--- a/src/hotspot/share/jbolt/jBoltDcmds.cpp
+++ b/src/hotspot/share/jbolt/jBoltDcmds.cpp
@@ -24,7 +24,8 @@
#include "jbolt/jBoltDcmds.hpp"
#include "jbolt/jBoltControlThread.hpp"
#include "jbolt/jBoltManager.hpp"
-
+#include "runtime/os.hpp"
+
bool register_jbolt_dcmds() {
uint32_t full_export = DCmd_Source_Internal | DCmd_Source_AttachAPI | DCmd_Source_MBean;
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JBoltStartDCmd>(full_export, true, false));
@@ -199,8 +200,12 @@ void JBoltDumpDCmd::execute(DCmdSource source, TRAPS) {
output()->print_cr("Failed: File open error or NULL: %s", path);
break;
case JBoltOK:
- rp = realpath(path, buffer);
+#ifdef __linux__
+ rp = os::Posix::realpath(path, buffer, sizeof(buffer));
output()->print_cr("Successful: Dump to %s", buffer);
+#else
+ output()->print_cr("Successful: Dump to %s", path);
+#endif
break;
default:
ShouldNotReachHere();
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index d9580e57e..a010df8d0 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -557,8 +557,10 @@ TRACE_REQUEST_FUNC(CodeCacheConfiguration) {
event.set_nonNMethodSize(NonNMethodCodeHeapSize);
event.set_profiledSize(ProfiledCodeHeapSize);
event.set_nonProfiledSize(NonProfiledCodeHeapSize);
+#if INCLUDE_JBOLT
event.set_jboltHotSize(JBoltCodeHeapSize);
event.set_jboltTmpSize(JBoltCodeHeapSize);
+#endif
event.set_expansionSize(CodeCacheExpansionSize);
event.set_minBlockLength(CodeCacheMinBlockLength);
event.set_startAddress((u8)CodeCache::low_bound());
diff --git a/src/hotspot/share/runtime/sweeper.cpp b/src/hotspot/share/runtime/sweeper.cpp
index 82f25c50b..fd174d720 100644
--- a/src/hotspot/share/runtime/sweeper.cpp
+++ b/src/hotspot/share/runtime/sweeper.cpp
@@ -378,7 +378,7 @@ void NMethodSweeper::possibly_sweep() {
// allocations go to the non-profiled heap and we must be make sure that there is
// enough space.
double free_percent = 1 / CodeCache::reverse_free_ratio(CodeBlobType::MethodNonProfiled) * 100;
- if (free_percent <= StartAggressiveSweepingAt || (UseJBolt && JBoltManager::force_sweep())) {
+ if (free_percent <= StartAggressiveSweepingAt JBOLT_ONLY( || (UseJBolt && JBoltManager::force_sweep()) )) {
do_stack_scanning();
}
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 6dd187652..638d73e6b 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -297,6 +297,9 @@
#define JFR_ONLY(code)
#define NOT_JFR_RETURN() {}
#define NOT_JFR_RETURN_(code) { return code; }
+#if INCLUDE_JBOLT
+#define INCLUDE_JBOLT 0 // INCLUDE_JBOLT depends on INCLUDE_JFR
+#endif
#endif
#ifndef INCLUDE_JVMCI
--
2.23.0

BIN
jdk-updates-jdk11u-jdk-11.0.26-ga.tar.xz → jdk-updates-jdk11u-jdk-11.0.27-ga.tar.xz
View File

Binary file not shown.

66
openjdk-11.spec
View File

@ -123,12 +123,15 @@
%ifarch %{ppc64le}
%global archinstall ppc64le
%endif
%ifarch sw_64
%global archinstall sw64
%endif
%global with_systemtap 1
# New Version-String scheme-style defines
%global majorver 11
%global securityver 26
%global securityver 27
# buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place
@ -149,12 +152,12 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 4
%global buildver 6
%global patchver 0
%global project jdk-updates
%global repo jdk11u
%global revision jdk-11.0.26-ga
%global revision jdk-11.0.27-ga
%global full_revision %{project}-%{repo}-%{revision}
# priority must be 7 digits in total
# setting to 1, so debug ones can have 0
@ -459,7 +462,9 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
%ifnarch sw_64
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jspawnhelper
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
@ -576,7 +581,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
%ifnarch loongarch64
%ifnarch loongarch64 sw_64
%ifarch %{aarch64} x86_64
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
%endif
@ -768,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
Release: 1
Release: 0
# 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
@ -902,6 +907,11 @@ Patch93: Cache-byte-when-constructing-String-with-duplicate-c.patch
# 11.0.25
Patch94: change-ActivePrcoessorCount-only-for-HBase.patch
# 11.0.26
Patch96: add-jbolt-feature.patch
Patch97: fix-potential-build-fail-in-jbolt.patch
############################################
#
# riscv64 specific patches
@ -909,6 +919,13 @@ Patch94: change-ActivePrcoessorCount-only-for-HBase.patch
############################################
Patch2000: Add-riscv64-support.patch
############################################
#
# sw64 specific patches
#
############################################
Patch6000: add-sw_64-support.patch
BuildRequires: elfutils-extra
BuildRequires: autoconf
BuildRequires: alsa-lib-devel
@ -1140,7 +1157,7 @@ fi
pushd %{top_level_dir_name}
# OpenJDK patches
%ifnarch loongarch64 ppc64le
%ifnarch loongarch64 ppc64le sw_64
%ifarch riscv64
%patch2000 -p1
%else
@ -1195,11 +1212,16 @@ pushd %{top_level_dir_name}
%patch92 -p1
%patch93 -p1
%patch94 -p1
%patch96 -p1
%patch97 -p1
%endif
%endif
%ifarch loongarch64
%patch2001 -p1
%endif
%ifarch sw_64
%patch6000 -p1
%endif
popd # openjdk
# Extract systemtap tapsets
@ -1258,7 +1280,7 @@ export NUM_PROC=${NUM_PROC:-1}
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
%endif
%ifarch %{aarch64} riscv64
%ifarch %{aarch64} riscv64 sw_64
export ARCH_DATA_MODEL=64
%endif
@ -1290,7 +1312,9 @@ bash ../configure \
--with-version-opt="" \
--with-vendor-version-string="%{vendor_version_string}" \
%ifnarch loongarch64 ppc64le
--with-vendor-name="BiSheng" \
%ifnarch sw_64
--with-vendor-name="BiSheng" \
%endif
%endif
%ifarch loongarch64
--with-vendor-name="Loongson" \
@ -1301,17 +1325,29 @@ bash ../configure \
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
--with-debug-level=$debugbuild \
--with-native-debug-symbols=internal \
%ifarch sw_64
--with-jvm-variants=custom \
--with-jvm-features=serialgc,vm-structs,parallelgc,compiler2,management,nmt,g1gc,cmsgc,jvmti,services,jni-check,jfr \
--with-zlib=bundled \
%else
--enable-unlimited-crypto \
--with-zlib=system \
%endif
--with-libjpeg=system \
--with-giflib=system \
--with-libpng=system \
--with-lcms=system \
--with-harfbuzz=system \
--with-stdc++lib=dynamic \
%ifarch sw_64
--with-extra-cflags=" -mieee -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=type-limits -Wno-error=format-security -Wno-error=conversion-null -Wno-error=sign-compare -Wno-error=int-to-pointer-cast -mgprel-size=32" \
--with-extra-cxxflags="-mieee -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=type-limits -Wno-error=format-security -Wno-error=conversion-null -Wno-error=sign-compare -Wno-error=int-to-pointer-cast -mgprel-size=32" \
--with-extra-ldflags=" -mieee -Wl,-no-relax" \
%else
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
--with-extra-cflags="$EXTRA_CFLAGS" \
--with-extra-ldflags="%{ourldflags}" \
%endif
--with-num-cores="$NUM_PROC" \
--disable-javac-server \
--disable-warnings-as-errors \
@ -1715,6 +1751,18 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
%changelog
* Thu Apr 17 2025 yangyingqing <yangyingqing@h-partners.com> - 1:11.0.27.6-0
- update to 11.0.27+6(GA)
- delete 8347965-tz-Update-Timezone-Data-to-2025a.patch
- add fix-potential-build-fail-in-jbolt.patch
* Tue Apr 1 2025 2025 swcompiler <lc@wxiat.cn> - 1:11.0.26.4-3
- add sw64 port to 11.0.26
* Tue Mar 04 2025 eapen <zhangyipeng7@huawei.com> - 1:11.0.26.4-2
- (tz) update Timezone Data to 2025a
- add jbolt feature
* Wed Feb 12 2025 Dingli Zhang <dingli@iscas.ac.cn> - 1:11.0.26.4-1
- update riscv64 port to 11.0.26
@ -1746,7 +1794,7 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
* Thu Aug 1 2024 aoqi <aoqi@loongson.cn> - 1.11.0.24.8-5
- update LoongArch64 port to 11.0.24
* Thu Jul 29 2024 DXwangg <wangjiawei80@huawei.com> - 1.11.0.24.8-4
* Mon Jul 29 2024 DXwangg <wangjiawei80@huawei.com> - 1.11.0.24.8-4
- modified delete_expired_certificates.patch
* Thu Jul 25 2024 songliyang <songliyang@kylinos.cn> - 1.11.0.24.8-3