diff --git a/Add-AArch64-clang-longjmp-support.patch b/Add-AArch64-clang-longjmp-support.patch
index c39f9c19e8e11c6662dc4758acac89fa0f981480..aaf53ef2c611ba145910fee0bb70392ec28be065 100644
--- a/Add-AArch64-clang-longjmp-support.patch
+++ b/Add-AArch64-clang-longjmp-support.patch
@@ -1,8 +1,17 @@
+From b497759d9f4ba22a7b341b7c6710f6e07e25ab08 Mon Sep 17 00:00:00 2001
+From: liyunfei <liyunfei33@huawei.com>
+Date: Tue, 29 Aug 19:59:58 2023 +0800
+Subject: [PATCH] Add AArch64 clang longjmp support
+
+---
+ include/pub_tool_libcsetjmp.h | 105 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 105 insertions(+)
+
 diff --git a/include/pub_tool_libcsetjmp.h b/include/pub_tool_libcsetjmp.h
-index 681450cef..ccdf295df 100644
+index 69bed7c..6eb398f 100644
 --- a/include/pub_tool_libcsetjmp.h
 +++ b/include/pub_tool_libcsetjmp.h
-@@ -126,6 +126,111 @@ UWord VG_MINIMAL_SETJMP(VG_MINIMAL_JMP_BUF(_env));
+@@ -142,6 +142,111 @@ UWord VG_MINIMAL_SETJMP(VG_MINIMAL_JMP_BUF(_env));
  __attribute__((noreturn))
  void  VG_MINIMAL_LONGJMP(VG_MINIMAL_JMP_BUF(_env));
  
@@ -114,4 +123,6 @@ index 681450cef..ccdf295df 100644
  #else
  
  /* The default implementation. */
- --
\ No newline at end of file
+-- 
+2.51.0
+
diff --git a/valgrind.spec b/valgrind.spec
index 4317cb8288648b5f8f42dc30795fa4f20110a327..fa8601fada47df1368aa3629c1ffe016ba12ee27 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -21,7 +21,7 @@
 
 Name:           valgrind
 Version:        3.22.0
-Release:        3
+Release:        4
 Epoch:          1
 Summary:        An instrumentation framework for building dynamic analysis tools
 License:        GPLv2+
@@ -30,11 +30,11 @@ Source0:        https://sourceware.org/pub/%{name}/%{name}-%{version}.tar.bz2
 
 Patch1:         valgrind-3.9.0-cachegrind-improvements.patch
 Patch2:         valgrind-3.9.0-ldso-supp.patch
+# Add LOONGARCH64 support
+Patch3:         Add-LOONGARCH64-Linux-support.patch
 %if "%{toolchain}" == "clang"
-Patch3:         Add-AArch64-clang-longjmp-support.patch
+Patch4:         Add-AArch64-clang-longjmp-support.patch
 %endif
-# Add LOONGARCH64 support
-Patch4:         Add-LOONGARCH64-Linux-support.patch
 # valgrind-monitor.py regular expressions should use raw strings
 # https://bugs.kde.org/show_bug.cgi?id=476708
 Patch5:         valgrind-3.22.0-valgrind-monitor-python-re.patch
@@ -114,6 +114,9 @@ popd
 %{_mandir}/man1/*
 
 %changelog
+* Thu Aug 28 2025 jchzhou <zhoujiacheng@iscas.ac.cn> - 1:3.22.0-4
+- Refresh and reorder patch Add-AArch64-clang-longjmp-support.patch to avoid confliction with other patches in some cases
+
 * Tue Jan 14 2025 Ge Wang <wang__ge@126.com> - 1:3.22.0-3
 - Remove empty soft link file