diff --git a/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz b/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz
similarity index 80%
rename from OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz
rename to OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz
index ffd60eaaa73c14b209fee3386efedef6c45001be..14fdee29b81f5cabf63eb6fe880f3d2ee4d3c3ef 100644
Binary files a/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz and b/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz differ
diff --git a/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz b/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz
similarity index 78%
rename from OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz
rename to OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz
index 896dce1cf72940b0bf4ffe2abe329216d335eedc..99e206e3383cdde55933310df69d4b9dc680a715 100644
Binary files a/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz and b/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz differ
diff --git a/downgrade-the-glibc-symver-of-log2f-posix_spawn.patch b/downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
index ef48f54409855387d97403d372b33007be4ab89f..580781484547ad1d93e2c0728efafd8c3598a8f3 100644
--- a/downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
+++ b/downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
@@ -25,8 +25,8 @@ index becd187..9bbcb0c 100644
 +#endif
 +
  #ifndef PRODUCT
- extern int explicit_null_checks_inserted,
-            explicit_null_checks_elided;
+ extern uint explicit_null_checks_inserted,
+             explicit_null_checks_elided;
 diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c
 index 3854f36..26cf41c 100644
 --- a/src/java.base/unix/native/libjava/ProcessImpl_md.c
diff --git a/downgrade-the-glibc-symver-of-memcpy.patch b/downgrade-the-glibc-symver-of-memcpy.patch
index 8bdc71ea17137d71c7f1ef1697a7838c38fc65e6..1be60a1b86210195f65a0245396df3679cb97ada 100644
--- a/downgrade-the-glibc-symver-of-memcpy.patch
+++ b/downgrade-the-glibc-symver-of-memcpy.patch
@@ -36,8 +36,8 @@ diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
 index 65edd04..d5b689e 100644
 --- a/make/hotspot/lib/CompileJvm.gmk
 +++ b/make/hotspot/lib/CompileJvm.gmk
-@@ -167,6 +167,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
-     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
+@@ -204,6 +204,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
+     STATIC_LIB_EXCLUDE_OBJS := $(LIBJVM_STATIC_EXCLUDE_OBJS), \
  ))
  
 +MEMCPY_OBJECT_FILE := $(JVM_OUTPUTDIR)/objs/memcpy$(OBJ_SUFFIX)
diff --git a/jdk-updates-jdk21u-jdk-21+35.tar.gz b/jdk-updates-jdk22u-jdk-22+36.tar.gz
similarity index 82%
rename from jdk-updates-jdk21u-jdk-21+35.tar.gz
rename to jdk-updates-jdk22u-jdk-22+36.tar.gz
index eec7d6041e94e0ccb997027f266cd6e0f75f03e8..182423ff019d0a51921cbc87d42515ff6a0ad1f4 100644
Binary files a/jdk-updates-jdk21u-jdk-21+35.tar.gz and b/jdk-updates-jdk22u-jdk-22+36.tar.gz differ
diff --git a/openjdk-latest.spec b/openjdk-latest.spec
index 90755d6565014f18729c1e83e18f976834d5e7cf..e091a9b72ad56a1019ba3283c40cffb8e8bcad89 100644
--- a/openjdk-latest.spec
+++ b/openjdk-latest.spec
@@ -81,7 +81,7 @@
 # By default, we build a debug build during main build on JIT architectures
 %if %{with slowdebug}
 %ifarch %{jit_arches}
-%global include_debug_build 0
+%global include_debug_build 1
 %else
 %global include_debug_build 0
 %endif
@@ -151,7 +151,7 @@
 
 # New Version-String scheme-style defines
 # If you bump majorver, you must bump also vendor_version_string
-%global majorver 21
+%global majorver 22
 # Used via new version scheme. JDK 19 was
 # GA'ed in March 2022 => 22.3
 %global vendor_version_string BiSheng
@@ -159,7 +159,7 @@
 # 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
-%global buildjdkver 21
+%global buildjdkver 22
 # We don't add any LTS designator for STS packages (Fedora and EPEL).
 # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
 %if 0%{?rhel} && !0%{?epel}
@@ -175,7 +175,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        35
+%global buildver        36
 %global rpmrelease      1
 # 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
@@ -554,6 +554,7 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
 %ifarch %{svml_arches}
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsvml.so
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsimdsort.so
 %endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsyslookup.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
@@ -894,7 +895,7 @@ Name:    java-latest-%{origin}
 Version: %{newjavaver}.%{buildver}
 # This package needs `.rolling` as part of Release so as to not conflict on install with
 # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
-Release: 2
+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
@@ -930,8 +931,8 @@ URL:      http://openjdk.java.net/
 # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
 Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz
-Source1: OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz
-Source2: OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz
+Source1: OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz
+Source2: OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -965,7 +966,6 @@ Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
 Patch2: rh1648644-java_access_bridge_privileged_security.patch
 Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
 # Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
-Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
 
 #############################################
 #
@@ -1210,7 +1210,6 @@ pushd %{top_level_dir_name}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 popd # openjdk
@@ -1329,10 +1328,10 @@ ARCH=$(uname -m)
 BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk
 if [ "$ARCH" = "x86_64" ]; then
     tar -xf %{SOURCE2}
-    BOOTJDKPATH=$PWD/jdk-20.0.2+9
+    BOOTJDKPATH=$PWD/jdk-21.0.3+9
 elif [ "$ARCH" = "aarch64" ]; then
     tar -xf %{SOURCE1}
-    BOOTJDKPATH=$PWD/jdk-20.0.2+9
+    BOOTJDKPATH=$PWD/jdk-21.0.3+9
 elif [ "$ARCH" = "riscv64" ]; then
     :
 else
@@ -1435,7 +1434,7 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
 # Check debug symbols are present and can identify code
 find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
 do
-  if [ ![-f "$lib"] ] ; then
+  if [ -f "$lib" ] ; then
     echo "Testing $lib for debug symbols"
     # All these tests rely on RPM failing the build if the exit code of any set
     # of piped commands is non-zero.
@@ -1786,6 +1785,9 @@ cjc.mainProgram(arg)
 
 
 %changelog
+* Wed Jun 05 2024 Autistic_boyya <wangzhongyi7@huawei.com> - 1:22.0.0.36-rolling
+- update to jdk22+36
+
 * Mon May 06 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:21.0.0.35-2
 - Backport JDK-8316859 for riscv64