Merge master(update to 17.0.12)

8280872-Reorder-code-cache-segments-to-improv.patch

@@ -208,9 +208,9 @@ deleted file mode 100644
 index f47331a6d..000000000
 --- a/test/hotspot/jtreg/compiler/c2/aarch64/TestFarJump.java
 +++ /dev/null
-@@ -1,137 +0,0 @@
+@@ -1,136 +0,0 @@
 -/*
-- * Copyright (c) 2022, BELLSOFT. All rights reserved.
+- * Copyright (c) 2024, BELLSOFT. 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
@@ -300,10 +300,9 @@ index f47331a6d..000000000
 -            "-Xbatch",
 -            "-XX:+TieredCompilation",
 -            "-XX:+SegmentedCodeCache",
--            "-XX:CompileOnly=" + className + "::main",
 -            "-XX:ReservedCodeCacheSize=" + (bigCodeHeap ? "256M" : "200M"),
 -            "-XX:+UnlockDiagnosticVMOptions",
--            "-XX:+PrintAssembly",
+-            "-XX:CompileCommand=option," + className + "::main,bool,PrintAssembly,true",
 -            className};
 -
 -        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(procArgs);

add-version-txt.patch

@@ -13,7 +13,7 @@ index 000000000..b717bafbe
 --- /dev/null
 +++ b/version.txt
 @@ -0,0 +1 @@
-+17.0.10.0.13
++17.0.12.0.13
 -- 
 2.19.0
 

openjdk-17.spec

@@ -161,7 +161,7 @@
 # Used via new version scheme. JDK 17 was
 # GA'ed in March 2021 => 21.9
 %global vendor_version_string 21.9
-%global securityver 11
+%global securityver 12
 # 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
@@ -176,14 +176,18 @@
   %global lts_designator_zip ""
 %endif
 
+%ifarch loongarch64
+%global vendor_version_string Loongson
+%else
 %global vendor_version_string BiSheng
+%endif
 
 # Standard JPackage naming and versioning defines
 %global origin          openjdk
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        9
+%global buildver        7
 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -558,6 +562,9 @@ exit 0
 %ifarch %{svml_arches}
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsvml.so
 %endif
+%ifarch %{aarch64}
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2kae.so
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsyslookup.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
@@ -594,6 +601,9 @@ exit 0
  %{etcjavadir -- %{?1}}/conf/security/policy/README.txt
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.policy
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.security
+%ifarch %{aarch64}
+%config(noreplace) %{etcjavadir -- %{?1}}/conf/kaeprovider.conf
+%endif
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/logging.properties
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.cfg
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/jmxremote.access
@@ -893,7 +903,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
@@ -1000,6 +1010,9 @@ Patch41: 8312200-Fix-Parse-catch_call_exceptions-memory-leak.patch
 Patch42: Add-problemlist.patch
 Patch43: puyuan-jdk17.0.9-patch.patch
 
+#17.0.11
+Patch44: jdk17-Add-KAE-provider.patch
+
 ############################################
 #
 # LoongArch64 specific patches
@@ -1040,6 +1053,7 @@ BuildRequires: nss-devel
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zip
+BuildRequires: openssl-devel
 BuildRequires: javapackages-filesystem
 BuildRequires: java-%{buildjdkver}-openjdk-devel
 # Zero-assembler build requirement
@@ -1255,6 +1269,7 @@ pushd %{top_level_dir_name}
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
 
 popd # openjdk
 %endif
@@ -1377,23 +1392,19 @@ bash ../configure \
 %endif
 %ifarch %{ppc64le}
     --with-jobs=1 \
+%endif
+%ifarch %{aarch64}
+    --enable-kae=yes \
 %endif
     --with-version-build=%{buildver} \
     --with-version-pre=\"${EA_DESIGNATOR}\" \
     --with-version-opt=%{lts_designator} \
-%ifnarch loongarch64
-    --with-vendor-version-string="%{vendor_version_string}" \
-    --with-vendor-name="openEuler Community" \
-%endif
 %if "%toolchain" == "clang"
     --with-toolchain-type=clang \
 %endif
     --with-vendor-url="https://openeuler.org/" \
     --with-vendor-bug-url="%{bug_url}" \
     --with-vendor-vm-bug-url="%{bug_url}" \
-    --with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-17/issues/" \
-    --with-vendor-vm-bug-url="https://gitee.com/src-openeuler/openjdk-17/issues/" \
-    --with-vendor-name="BiSheng" \
     --with-vendor-version-string="%{vendor_version_string}" \
     --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
     --with-debug-level=$debugbuild \
@@ -1410,7 +1421,12 @@ bash ../configure \
     --with-num-cores="$NUM_PROC" \
     --with-source-date="${SOURCE_DATE_EPOCH}" \
     --disable-javac-server \
-    --disable-warnings-as-errors
+    --disable-warnings-as-errors \
+%ifarch loongarch64
+    --with-vendor-name="Loongson" \
+%else
+    --with-vendor-name="BiSheng" \
+%endif
 
 # Debug builds don't need same targets as release for
 # build speed-up
@@ -1693,9 +1709,10 @@ else
   end
 end
 -- run content of included file with fake args
+arg = nil; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
 cjc = require "copy_jdk_configs.lua"
-arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
+args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-cjc.mainProgram(arg)
+cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect this 'main', so it should run under all circumstances, except fatal error
 
 %post
 %{post_script %{nil}}
@@ -1820,12 +1837,26 @@ cjc.mainProgram(arg)
 
 
 %changelog
-* Thu Jun 6 2024 panxuefeng <panxuefeng@loongson.cn> - 1:17.0.11.9-1
+* Thu Jul 18 2024 DXwangg <wangjiawei80@huawei.com> - 1:17.0.12.7-0
-- update LoongArch64-support.patch
+- modify 8280872-Reorder-code-cache-segments-to-improv.patch
+- update to 17.0.12+7(ga)
+
+* Tue Jul 16 2024 songliyang <songliyang@kylinos.cn> - 1:17.0.11.9-4
+- null the arg to solve openjdk-headless install error
+
+* Thu Jul 4 2024 Autistic_boyya <wangzhongyi7@huawei.com> - 1:17.0.11.9-3
+- add jdk17-Add-KAE-provider.patch
+
+* Thu Jun 20 2024 aoqi <aoqi@loongson.cn> - 1:17.0.11.9-2
+- update LoongArch64 port to 17.0.11
+
+* Thu May 16 2024 songliyang <songliyang@kylinos.cn> - 1:17.0.11.9-1
+- rewrite LoongArch64-support.patch to sovle error while applying this patch in prep stage
+- fix loongarch vendor error and delete redundant vendor args
 
 * Thu Apr 18 2024 Autistic_boyya <wangzhongyi7@huawei.com> - 1:17.0.11.9-0.rolling
 - del 8295068-SSLEngine-throws-NPE-parsing-CertificateRequ.patch
-- modify puyuan-jdk17.0.9-patch.patch  
+- modify puyuan-jdk17.0.9-patch.patch
 
 * Mon Feb 26 2024 misaka00251 <liuxin@iscas.ac.cn> - 1:17.0.10.9-2
 - Remove riscv64 support patch, already upstreamed