Bug#1109782: unblock: 7zip/25.00+dfsg-1 (9/13)
From
Bastian Germann@21:1/5 to
All on Wed Jul 23 19:40:02 2025
[continued from previous message]
+ || defined(__GNUC__) && (__GNUC__ >= 8)
+ #define USE_HW_VAES
+ #endif
+ #elif defined(_MSC_VER)
+ #define USE_HW_AES
+ #define USE_HW_VAES
+ #endif
+
#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
#if defined(__ARM_FEATURE_AES) \
@@ -186,15 +205,15 @@
#define SET_AES_FUNC_2(f2) \
if (algo == 2) if (g_Aes_SupportedFunctions_Flags & k_Aes_SupportedFunctions_HW) \
{ f = f2; }
- #ifdef MY_CPU_X86_OR_AMD64
+ #ifdef USE_HW_VAES
#define SET_AES_FUNC_23(f2, f3) \
SET_AES_FUNC_2(f2) \
if (algo == 3) if (g_Aes_SupportedFunctions_Flags & k_Aes_SupportedFunctions_HW_256) \
{ f = f3; }
- #else // MY_CPU_X86_OR_AMD64
+ #else // USE_HW_VAES
#define SET_AES_FUNC_23(f2, f3) \
SET_AES_FUNC_2(f2)
- #endif // MY_CPU_X86_OR_AMD64
+ #endif // USE_HW_VAES
#else // USE_HW_AES
#define SET_AES_FUNC_23(f2, f3)
#endif // USE_HW_AES
diff -Nru 7zip-24.09+dfsg/CPP/7zip/ICoder.h 7zip-25.00+dfsg/CPP/7zip/ICoder.h --- 7zip-24.09+dfsg/CPP/7zip/ICoder.h 2023-04-06 12:00:00.000000000 +0200
+++ 7zip-25.00+dfsg/CPP/7zip/ICoder.h 2024-12-14 20:00:00.000000000 +0100
@@ -136,6 +136,9 @@
kAffinity, // VT_UI8
kBranchOffset, // VT_UI4
kHashBits, // VT_UI4
+ kNumThreadGroups, // VT_UI4
+ kThreadGroup, // VT_UI4
+ kAffinityInGroup, // VT_UI8
/*
// kHash3Bits, // VT_UI4
// kHash2Bits, // VT_UI4
diff -Nru 7zip-24.09+dfsg/CPP/7zip/Sort.mak 7zip-25.00+dfsg/CPP/7zip/Sort.mak --- 7zip-24.09+dfsg/CPP/7zip/Sort.mak 1970-01-01 01:00:00.000000000 +0100
+++ 7zip-25.00+dfsg/CPP/7zip/Sort.mak 2025-07-02 10:00:00.000000000 +0200
@@ -0,0 +1,6 @@
+!IF defined(USE_NO_ASM) || defined(USE_C_SORT) || "$(PLATFORM)" == "ia64" || "$(PLATFORM)" == "mips" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "arm64"
+C_OBJS = $(C_OBJS) \
+!ELSE
+ASM_OBJS = $(ASM_OBJS) \
+!ENDIF
+ $O\Sort.obj
diff -Nru 7zip-24.09+dfsg/CPP/7zip/UI/Common/ArchiveCommandLin