mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-18 13:29:16 +02:00
4ca450deac
Release Notes: https://sourceforge.net/p/sevenzip/discussion/45797/thread/3f550826d8/#e950 Manually adjust: - 7-zip-flags.patch Automatically refresh: - 7-zip-musl.patch Signed-off-by: Nick Hainke <vincent@systemli.org>
60 lines
1.2 KiB
Diff
60 lines
1.2 KiB
Diff
--- 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 *
|
|
*/
|
|
|
|
// ret2 =
|
|
- pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
|
|
+ //pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
|
|
// if (ret2) ret = ret2;
|
|
#endif
|
|
}
|
|
@@ -275,14 +275,12 @@ WRes Thread_Create_With_CpuSet(CThread *
|
|
if (!ret)
|
|
{
|
|
p->_created = 1;
|
|
- /*
|
|
if (cpuSet)
|
|
{
|
|
// ret2 =
|
|
pthread_setaffinity_np(p->_tid, sizeof(*cpuSet), cpuSet);
|
|
// if (ret2) ret = ret2;
|
|
}
|
|
- */
|
|
}
|
|
}
|
|
// ret2 =
|
|
--- a/C/Threads.h
|
|
+++ b/C/Threads.h
|
|
@@ -20,6 +20,7 @@
|
|
#endif
|
|
|
|
#include <pthread.h>
|
|
+#include <sched.h>
|
|
|
|
#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__
|