!322 merge master (update to 11.0.23)

From: @DXwangg 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111

8224675-Late-GC-barrier-insertion-for-ZGC.patch

@@ -2812,7 +2812,7 @@ index 5454d1350..d7eb3996b 100644
 --- a/src/hotspot/share/opto/loopnode.cpp
 +++ b/src/hotspot/share/opto/loopnode.cpp
 @@ -3017,9 +3018,7 @@ void PhaseIdealLoop::build_and_optimize() {
-   build_loop_late( visited, worklist, nstack );
+   if (C->failing()) { return; }
 
    if (_verify_only) {
 -    // restore major progress flag

delete_expired_certificates.patch

@@ -120,14 +120,15 @@ index 122a01901..c131bd493 100644
              + File.separator + "security" + File.separator + "cacerts";
  
      // The numbers of certs now.
--    private static final int COUNT = 106;
+-    private static final int COUNT = 108;
-+    private static final int COUNT = 103;
++    private static final int COUNT = 105;
  
      // SHA-256 of cacerts, can be generated with
      // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
      private static final String CHECKSUM
--            = "61:5F:6D:C5:9C:A3:8A:65:3F:CB:F9:F5:26:04:23:F4:53:A6:8C:B3:8B:2B:0A:F0:66:7D:9E:67:B9:4D:AC:B7";
+-            = "81:D4:84:F6:92:78:A4:82:25:06:DC:42:25:C9:5D:6C:63:E4:99:CE:BC:ED:66:B3:8C:BA:E6:BA:6B:34:0F:01";
-+            = "AC:5D:D0:F5:D4:E9:7B:8E:69:B9:E3:6C:08:44:0D:CB:63:83:D5:A0:D4:DE:4F:17:4F:D3:83:6D:99:26:94:59";
++            = "2F:05:4C:2D:16:ED:2B:56:D6:07:03:A9:49:C4:A2:E6:16:2C:0D:92:FD:C8:6C:28:DF:77:26:A9:E7:D8:12:47";
+
      // map of cert alias to SHA-256 fingerprint
      @SuppressWarnings("serial")
      private static final Map<String, String> FINGERPRINT_MAP = new HashMap<>() {

openjdk-11.spec

@@ -55,6 +55,7 @@
 
 %global aarch64         aarch64
 %global riscv64         riscv64
+%global ppc64le         ppc64le
 
 # By default, we build a debug build during main build on JIT architectures
 %if %{with slowdebug}
@@ -110,15 +111,21 @@
 %ifarch %{aarch64}
 %global archinstall aarch64
 %endif
+%ifarch loongarch64
+%global archinstall loongarch64
+%endif
 %ifarch %{riscv64}
 %global archinstall riscv64
 %endif
+%ifarch %{ppc64le}
+%global archinstall ppc64le
+%endif
 
 %global with_systemtap 1
 
 # New Version-String scheme-style defines
 %global majorver 11
-%global securityver 22
+%global securityver 23
 # 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
@@ -134,12 +141,12 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        7
+%global buildver        9
 %global patchver	0
 
 %global project		jdk-updates
 %global repo		jdk11u
-%global revision	jdk-11.0.22-ga
+%global revision	jdk-11.0.23-ga
 %global full_revision %{project}-%{repo}-%{revision}
 # priority must be 7 digits in total
 # setting to 1, so debug ones can have 0
@@ -561,9 +568,11 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
+%ifnarch loongarch64
 %ifarch %{aarch64} x86_64
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
 %endif
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/include
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/ct.sym
 %if %{with_systemtap}
@@ -748,7 +757,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 1
+Release: 2
 # 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
@@ -803,6 +812,14 @@ Source11: nss.cfg.in
 # due to memory leak).
 Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
 
+############################################
+#
+# LoongArch64 specific patches
+#
+############################################
+
+Patch2001: LoongArch64-support.patch
+
 #############################################
 #
 # OpenJDK specific patches
@@ -896,7 +913,7 @@ Patch93: Cache-byte-when-constructing-String-with-duplicate-c.patch
 # riscv64 specific patches
 #
 ############################################
-Patch2000: 2000-Add-riscv64-support-based-on-bishengjdk-riscv-branch.patch
+Patch2000: Add-riscv64-support.patch
 
 BuildRequires: elfutils-extra
 BuildRequires: autoconf
@@ -1129,6 +1146,7 @@ fi
 pushd %{top_level_dir_name}
 
 # OpenJDK patches
+%ifnarch loongarch64 ppc64le
 %ifarch riscv64
 %patch2000 -p1
 %else
@@ -1194,6 +1212,10 @@ pushd %{top_level_dir_name}
 %patch92 -p1
 %patch93 -p1
 %endif
+%endif
+%ifarch loongarch64
+%patch2001 -p1
+%endif
 popd # openjdk
 
 # %patch1000
@@ -1284,8 +1306,10 @@ bash ../configure \
     --with-version-build=%{buildver} \
     --with-version-pre="" \
     --with-version-opt="" \
+%ifnarch loongarch64 ppc64le
     --with-vendor-version-string="%{vendor_version_string}" \
     --with-vendor-name="Bisheng" \
+%endif
     --with-vendor-url="https://openeuler.org/" \
     --with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \
     --with-vendor-vm-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \
@@ -1399,6 +1423,7 @@ done
 # javaCalls.cpp:58 should map to:
 # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58
 # Using line number 1 might cause build problems. See:
+%ifnarch loongarch64
 gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
 handle SIGSEGV pass nostop noprint
 handle SIGILL pass nostop noprint
@@ -1411,6 +1436,7 @@ end
 run -version
 EOF
 #grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
+%endif
 
 # Check src.zip has all sources. See RHBZ#1130490
 jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
@@ -1703,6 +1729,25 @@ cjc.mainProgram(arg)
 
 
 %changelog
+* Wed May 06 2024 zhangxianting <zhangxianting@uniontech.com> - 1:11.0.23.9-1
+- recompress the source0
+
+* Mon Apr 29 2024 huangjie <huangjie150@huawei.com> - 1:11.0.23.9-0
+- modified delete_expired_certificates.patch
+
+* Thu Apr 18 2024 huangjie <huangjie150@huawei.com> - 1:11.0.23.9-0
+- modified 8224675-Late-GC-barrier-insertion-for-ZGC.patch
+- modified delete_expired_certificates.patch
+
+* Wed Mar 13 2024 jiahua.yu <jiahua.yu@shingroup.cn> - 1:11.0.22.7-3
+- init support for arch ppc64le
+
+* Mon Feb 26 2024 misaka00251 <liuxin@iscas.ac.cn> - 1:11.0.22.7-2
+- Fix build on riscv64
+
+* Tue Feb 20 2024 Leslie Zhai <zhaixiang@loongson.cn> - 1:11.0.22.7-1
+- init support of LoongArch64
+
 * Mon Mar 25 2024 neu-mobi <liuyulong35@huawei.com> - 1:11.0.22.7-1
 - add string optimization