Star2
20
代码
代码
Issues4
Pull Requests2
项目讨论
Wiki
分析
Star2
20
已合并
swjdk-11.0.30-ga update #457
lc-compiler创建于 3月27日
swjdk-11.0.30-ga update #457
已合并
lc-compiler创建于 3月27日
从little-huaduo/openjdk-11master-sw64-0327合入到src-openeuler/openjdk-11master
共 2 个文件变更+18-14
Madd-sw_64-support.patch+14-13
@@ -1,3 +1,4 @@
1+warning: refname 'jdk-11.0.30-ga' is ambiguous.
1diff --git a/Changelog.md b/Changelog.md2diff --git a/Changelog.md b/Changelog.md
2new file mode 1006443new file mode 100644
3index 0000000000..506556df234index 0000000000..506556df23
@@ -234,7 +235,7 @@ index 0000000000..faacaf6a2c
234+git update-index --assume-unchanged compile_commands.json235+git update-index --assume-unchanged compile_commands.json
235+236+
236diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk237diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
237-index 46fb9b4219..b1ec753d94 100644238+index 3795dc87f2..81c3553419 100644
238--- a/make/CompileJavaModules.gmk239--- a/make/CompileJavaModules.gmk
239+++ b/make/CompileJavaModules.gmk240+++ b/make/CompileJavaModules.gmk
240@@ -430,6 +430,7 @@ jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -Xlint:-exports -XDstringConca241@@ -430,6 +430,7 @@ jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -Xlint:-exports -XDstringConca
@@ -278,7 +279,7 @@ index 46fb9b4219..b1ec753d94 100644
278 --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler,jdk.aot \279 --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler,jdk.aot \
279 --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \280 --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \
280diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk281diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
281-index 918140fb5d..fb937b9c34 100644282+index c33ecd7673..ac69754a05 100644
282--- a/make/RunTestsPrebuilt.gmk283--- a/make/RunTestsPrebuilt.gmk
283+++ b/make/RunTestsPrebuilt.gmk284+++ b/make/RunTestsPrebuilt.gmk
284@@ -225,6 +225,10 @@ endif285@@ -225,6 +225,10 @@ endif
@@ -307,7 +308,7 @@ index 15ee438926..05659616a5 100644
307 eval $set_cc_for_build308 eval $set_cc_for_build
308 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \309 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
309diff --git a/make/autoconf/build-performance.m4 b/make/autoconf/build-performance.m4310diff --git a/make/autoconf/build-performance.m4 b/make/autoconf/build-performance.m4
310-index 7892b4001a..b428f2721b 100644311+index 940c9eaaca..d223418cd4 100644
311--- a/make/autoconf/build-performance.m4312--- a/make/autoconf/build-performance.m4
312+++ b/make/autoconf/build-performance.m4313+++ b/make/autoconf/build-performance.m4
313@@ -32,6 +32,10 @@ AC_DEFUN([BPERF_CHECK_CORES],314@@ -32,6 +32,10 @@ AC_DEFUN([BPERF_CHECK_CORES],
@@ -322,7 +323,7 @@ index 7892b4001a..b428f2721b 100644
322 elif test -x /usr/sbin/psrinfo; then323 elif test -x /usr/sbin/psrinfo; then
323 # Looks like a Solaris system324 # Looks like a Solaris system
324diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4325diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
325-index 8ead0e22d6..be7586b76d 100644326+index cb86f3acf0..2c2732d80c 100644
326--- a/make/autoconf/flags-cflags.m4327--- a/make/autoconf/flags-cflags.m4
327+++ b/make/autoconf/flags-cflags.m4328+++ b/make/autoconf/flags-cflags.m4
328@@ -289,9 +289,9 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],329@@ -289,9 +289,9 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
@@ -386,7 +387,7 @@ index 5d1d9efa39..fb732e25ea 100644
386 # The cpu defines below are for zero, we don't support them directly.387 # The cpu defines below are for zero, we don't support them directly.
387 elif test "x$OPENJDK_$1_CPU" = xsparc; then388 elif test "x$OPENJDK_$1_CPU" = xsparc; then
388diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js389diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
389-index 3b7194e425..f4c18d9dc0 100644390+index 8910c33506..4674afe0b9 100644
390--- a/make/conf/jib-profiles.js391--- a/make/conf/jib-profiles.js
391+++ b/make/conf/jib-profiles.js392+++ b/make/conf/jib-profiles.js
392@@ -233,7 +233,7 @@ var getJibProfilesCommon = function (input, data) {393@@ -233,7 +233,7 @@ var getJibProfilesCommon = function (input, data) {
@@ -1069,7 +1070,7 @@ index 0000000000..e748c76f48
1069 1070 
1070diff --git a/src/hotspot/cpu/sw64/assembler_sw64.hpp b/src/hotspot/cpu/sw64/assembler_sw64.hpp1071diff --git a/src/hotspot/cpu/sw64/assembler_sw64.hpp b/src/hotspot/cpu/sw64/assembler_sw64.hpp
1071new file mode 1006441072new file mode 100644
1072-index 0000000000..8ca7c184141073+index 0000000000..1e9f3ec28a
1073--- /dev/null1074--- /dev/null
1074+++ b/src/hotspot/cpu/sw64/assembler_sw64.hpp1075+++ b/src/hotspot/cpu/sw64/assembler_sw64.hpp
1075@@ -0,0 +1,2005 @@1076@@ -0,0 +1,2005 @@
@@ -1698,7 +1699,7 @@ index 0000000000..8ca7c18414
1698+ static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);1699+ static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);
1699+1700+
1700+ static bool reachable_from_branch_at(address branch, address target) {1701+ static bool reachable_from_branch_at(address branch, address target) {
1701-+ return uabs(target - branch) < branch_range;1702++ return g_uabs(target - branch) < branch_range;
1702+ }1703+ }
1703+1704+
1704+ // Floating-point Move (immediate)1705+ // Floating-point Move (immediate)
@@ -65522,7 +65523,7 @@ index 0000000000..2a00a5a26f
65522+ return icache_line_size;65523+ return icache_line_size;
65523+}65524+}
65524diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp65525diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
65525-index 2842a11f92..5698ae88d9 10064465526+index ac9d5ac190..bc129cba69 100644
65526--- a/src/hotspot/os/linux/os_linux.cpp65527--- a/src/hotspot/os/linux/os_linux.cpp
65527+++ b/src/hotspot/os/linux/os_linux.cpp65528+++ b/src/hotspot/os/linux/os_linux.cpp
65528@@ -430,7 +430,7 @@ void os::init_system_properties_values() {65529@@ -430,7 +430,7 @@ void os::init_system_properties_values() {
@@ -65567,7 +65568,7 @@ index 2842a11f92..5698ae88d9 100644
65567 #elif (defined MIPSEL)65568 #elif (defined MIPSEL)
65568 static Elf32_Half running_arch_code=EM_MIPS_RS3_LE;65569 static Elf32_Half running_arch_code=EM_MIPS_RS3_LE;
65569 #elif (defined PARISC)65570 #elif (defined PARISC)
65570-@@ -3232,9 +3243,13 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,65571+@@ -3234,9 +3245,13 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
65571 }65572 }
65572 65573
65573 // Define MAP_HUGETLB here so we can build HotSpot on old systems.65574 // Define MAP_HUGETLB here so we can build HotSpot on old systems.
@@ -65581,7 +65582,7 @@ index 2842a11f92..5698ae88d9 100644
65581 65582
65582 // Define MADV_HUGEPAGE here so we can build HotSpot on old systems.65583 // Define MADV_HUGEPAGE here so we can build HotSpot on old systems.
65583 #ifndef MADV_HUGEPAGE65584 #ifndef MADV_HUGEPAGE
65584-@@ -3243,6 +3258,22 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,65585+@@ -3245,6 +3260,22 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
65585 65586
65586 int os::Linux::commit_memory_impl(char* addr, size_t size,65587 int os::Linux::commit_memory_impl(char* addr, size_t size,
65587 size_t alignment_hint, bool exec) {65588 size_t alignment_hint, bool exec) {
@@ -65604,7 +65605,7 @@ index 2842a11f92..5698ae88d9 100644
65604 int err = os::Linux::commit_memory_impl(addr, size, exec);65605 int err = os::Linux::commit_memory_impl(addr, size, exec);
65605 if (err == 0) {65606 if (err == 0) {
65606 realign_memory(addr, size, alignment_hint);65607 realign_memory(addr, size, alignment_hint);
65607-@@ -4058,6 +4089,7 @@ size_t os::Linux::find_large_page_size() {65608+@@ -4060,6 +4091,7 @@ size_t os::Linux::find_large_page_size() {
65608 ARM32_ONLY(2 * M)65609 ARM32_ONLY(2 * M)
65609 IA32_ONLY(4 * M)65610 IA32_ONLY(4 * M)
65610 IA64_ONLY(256 * M)65611 IA64_ONLY(256 * M)
@@ -68136,7 +68137,7 @@ index 37bf331e91..6fc66e468f 100644
68136 68137
68137 // Test if x is within unsigned immediate range for width.68138 // Test if x is within unsigned immediate range for width.
68138diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp68139diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
68139-index 65b414a38c..0f11b0cf40 10064468140+index 1f6718d3e3..a08b52df08 100644
68140--- a/src/hotspot/share/asm/codeBuffer.cpp68141--- a/src/hotspot/share/asm/codeBuffer.cpp
68141+++ b/src/hotspot/share/asm/codeBuffer.cpp68142+++ b/src/hotspot/share/asm/codeBuffer.cpp
68142@@ -1190,7 +1190,11 @@ void CodeStrings::free() {68143@@ -1190,7 +1190,11 @@ void CodeStrings::free() {
@@ -68427,7 +68428,7 @@ index e01a242a57..d17e03002d 100644
68427 #else68428 #else
68428 #warning "Unconfigured platform"68429 #warning "Unconfigured platform"
68429diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp68430diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
68430-index 9fa79d4488..778e18f8ff 10064468431+index 16b2c8b970..3aec3e515a 100644
68431--- a/src/hotspot/share/oops/method.cpp68432--- a/src/hotspot/share/oops/method.cpp
68432+++ b/src/hotspot/share/oops/method.cpp68433+++ b/src/hotspot/share/oops/method.cpp
68433@@ -1504,9 +1504,11 @@ vmSymbols::SID Method::klass_id_for_intrinsics(const Klass* holder) {68434@@ -1504,9 +1504,11 @@ vmSymbols::SID Method::klass_id_for_intrinsics(const Klass* holder) {
Mopenjdk-11.spec+4-1
@@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
773 773 
774Name: java-%{javaver}-%{origin}774Name: java-%{javaver}-%{origin}
775Version: %{newjavaver}.%{buildver}775Version: %{newjavaver}.%{buildver}
776-Release: 4776+Release: 5
777# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons777# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
778# and this change was brought into RHEL-4. java-1.5.0-ibm packages778# and this change was brought into RHEL-4. java-1.5.0-ibm packages
779# also included the epoch in their virtual provides. This created a779# also included the epoch in their virtual provides. This created a
@@ -1773,6 +1773,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
1773 1773 
1774 1774 
1775%changelog1775%changelog
1776+* Thu Mar 26 2026 lc-compiler <lc@wxiat.com> -1:11.0.30.7-5
1777+- swjdk-11.0.30-ga update
1778+ 
1776* Tue Feb 24 2026 yangyudong <yangyudong3@huawei.com> -1:11.0.30.7-41779* Tue Feb 24 2026 yangyudong <yangyudong3@huawei.com> -1:11.0.30.7-4
1777- add fix-zlib-CVE-2026-27171.patch1780- add fix-zlib-CVE-2026-27171.patch
1778 1781