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.
This commit is contained in:
Jan Breig committed 2026-06-25 06:03:10 +02:00
1 parent 18cdd5e9c9
commit dace610d59
2 files changed
+11 -3

No files matched your search

+8
View File
@@ -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
+3 -3
View File
@@ -19,7 +19,7 @@
#include <immintrin.h>
#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