Merge df10ccbc8c into 2619131176

Merge pull request #3680 from benthetechguy/armhf
Add armv8l to list of 32 bit ARM targets
2025-09-22 11:47:55 +00:00 · 2025-06-25 19:06:48 +07:00 · 2025-06-25 04:14:22 +07:00 · 2025-06-24 15:28:01 -04:00 · 2024-12-18 21:24:46 +13:00
2 changed files with 6 additions and 2 deletions
--- a/cmake/cpu.cmake
+++ b/cmake/cpu.cmake
@ -40,7 +40,7 @@ endif()
 if (NOT ARM_TARGET)
    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64|armv8-a)$")
        set(ARM_TARGET 8)
-    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l|armv7ve)$")
+    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l|armv7ve|armv8l)$")
        set(ARM_TARGET 7)
    endif()
 endif()
--- a/src/backend/cpu/CpuWorker.cpp
+++ b/src/backend/cpu/CpuWorker.cpp
@ -36,7 +36,6 @@
 #include "crypto/rx/RxCache.h"
 #include "crypto/rx/RxDataset.h"
 #include "crypto/rx/RxVm.h"
-#include "crypto/ghostrider/ghostrider.h"
 #include "net/JobResults.h"


@ -45,6 +44,11 @@
 #endif


+#ifdef XMRIG_ALGO_GHOSTRIDER
+#include "crypto/ghostrider/ghostrider.h"
+#endif
+
+
 #ifdef XMRIG_FEATURE_BENCHMARK
 #   include "backend/common/benchmark/BenchState.h"
 #endif
Author	SHA1	Message	Date
virophagesp	982840b485	Merge `df10ccbc8c` into `2619131176`	2025-06-25 19:06:48 +07:00
xmrig	2619131176	Merge pull request #3680 from benthetechguy/armhf Add armv8l to list of 32 bit ARM targets	2025-06-25 04:14:22 +07:00
Ben Westover	1161f230c5	Add armv8l to list of 32 bit ARM targets armv8l is what CMAKE_SYSTEM_PROCESSOR is set to when an ARMv8 processor is in 32-bit mode, so it should be added to the ARMv7 target list even though it's v8 because it's 32 bits. Currently, it's not in any ARM target list which means x86 is assumed and the build fails.	2025-06-24 15:28:01 -04:00
virophagesp	df10ccbc8c	do not include ghostrider header if ghostrider is disabled in cmake	2024-12-18 21:24:46 +13:00