From dace610d59b1974b52c2ad8d30d93e2d78e6660a Mon Sep 17 00:00:00 2001 From: Jan Breig Date: Thu, 25 Jun 2026 06:03:10 +0200 Subject: [PATCH] Disable GCC pragmas for Android NDK builds on x86/x64 Fixes clang error due to invalid AVX-512 pragma on x86/x64 when building with Android NDK. --- client/CMakeLists.txt | 8 ++++++++ client/src/loclass/cipher_bs_avx512.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 800f30ff3..6a8c304db 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -508,6 +508,14 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|i.86") ) endif() +# Enable AVX 512 support for x64 +if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64") + set_source_files_properties( + src/loclass/cipher_bs_avx512.c + PROPERTIES COMPILE_OPTIONS "-mavx512f" + ) +endif() + add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c COMMAND sh ${PM3_ROOT}/tools/mkversion.sh ${CMAKE_BINARY_DIR}/version_pm3.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c diff --git a/client/src/loclass/cipher_bs_avx512.c b/client/src/loclass/cipher_bs_avx512.c index ac1b279a1..4cb784457 100644 --- a/client/src/loclass/cipher_bs_avx512.c +++ b/client/src/loclass/cipher_bs_avx512.c @@ -19,7 +19,7 @@ #include -#if defined(__GNUC__) || defined(__clang__) +#if (defined(__GNUC__) || defined(__clang__)) && !defined(__ANDROID__) #pragma GCC push_options #pragma GCC target("avx512f") #endif @@ -291,14 +291,14 @@ void doMAC_brute_match512(const uint64_t y_bits_bs[96 * BS512_WORDS], _mm512_storeu_si512((void *)match_out, mac_match); } -#if defined(__GNUC__) || defined(__clang__) +#if (defined(__GNUC__) || defined(__clang__)) && !defined(__ANDROID__) #pragma GCC pop_options #endif bool bs_avx512_supported(void) { static int cached = -1; if (cached < 0) { -#if defined(__GNUC__) || defined(__clang__) +#if (defined(__GNUC__) || defined(__clang__)) && !defined(__ANDROID__) __builtin_cpu_init(); cached = __builtin_cpu_supports("avx512f") ? 1 : 0; #else