diff --git a/tools/7z/Makefile b/tools/7z/Makefile
index 3b3ceeb0966..962fd5729c0 100644
--- a/tools/7z/Makefile
+++ b/tools/7z/Makefile
@@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=7z
-PKG_VERSION:=23.01
+PKG_VERSION:=24.05
 
 PKG_SOURCE:=$(PKG_NAME)$(subst .,,$(PKG_VERSION))-src.tar.xz
 PKG_SOURCE_URL:=https://7-zip.org/a/
-PKG_HASH:=356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74
+PKG_HASH:=63f341cf80b8d287c6e945519b3da0fa75553c85572a471b7fa6e68f9a90b790
 
 PKG_CPE_ID:=cpe:/a:7-zip:7-zip
 
diff --git a/tools/7z/patches/7-zip-flags.patch b/tools/7z/patches/7-zip-flags.patch
index b9b2152f22a..5c684b0689a 100644
--- a/tools/7z/patches/7-zip-flags.patch
+++ b/tools/7z/patches/7-zip-flags.patch
@@ -9,12 +9,12 @@
  endif
  
  # for object file
-@@ -32,7 +32,7 @@ endif
- # -save-temps
- CFLAGS_BASE_LIST = -c
+@@ -50,7 +50,7 @@ endif
+ endif
+ 
  # CFLAGS_BASE_LIST = -S
 -CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
 +CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) -D_GNU_SOURCE \
-  -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+  $(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
   -fPIC
  
diff --git a/tools/7z/patches/7-zip-musl.patch b/tools/7z/patches/7-zip-musl.patch
index e066cc8ec91..a08520a25ff 100644
--- a/tools/7z/patches/7-zip-musl.patch
+++ b/tools/7z/patches/7-zip-musl.patch
@@ -1,14 +1,3 @@
---- a/C/CpuArch.c
-+++ b/C/CpuArch.c
-@@ -766,8 +766,6 @@ BoolInt CPU_IsSupported_AES (void) { ret
- 
- #ifdef USE_HWCAP
- 
--#include <asm/hwcap.h>
--
-   #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
-   BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP)  & (HWCAP_  ## name2)) ? 1 : 0; }
- 
 --- a/C/Threads.c
 +++ b/C/Threads.c
 @@ -265,7 +265,7 @@ WRes Thread_Create_With_CpuSet(CThread *
@@ -18,7 +7,7 @@
 -      pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
 +      //pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
        // if (ret2) ret = ret2;
-       #endif
+ #endif
      }
 @@ -275,14 +275,12 @@ WRes Thread_Create_With_CpuSet(CThread *
      if (!ret)
@@ -37,7 +26,7 @@
    // ret2 =
 --- a/C/Threads.h
 +++ b/C/Threads.h
-@@ -20,6 +20,7 @@
+@@ -29,6 +29,7 @@ Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_
  #endif
  
  #include <pthread.h>
@@ -45,15 +34,3 @@
  
  #endif
  
---- a/CPP/Windows/SystemInfo.cpp
-+++ b/CPP/Windows/SystemInfo.cpp
-@@ -36,9 +36,6 @@
- #endif
- */
- 
--#ifdef MY_CPU_ARM_OR_ARM64
--#include <asm/hwcap.h>
--#endif
- #endif
- 
- #ifdef __linux__