Merge remote-tracking branch 'upstream/master'

This commit is contained in:
root 2017-07-01 13:57:30 +02:00
commit 30e37e973d

View file

@ -70,6 +70,7 @@ static float brute_force_per_second;
static void get_SIMD_instruction_set(char* instruction_set) {
#if defined (__i386__) || defined (__x86_64__)
#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8))
#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
if (__builtin_cpu_supports("avx512f")) strcpy(instruction_set, "AVX512F");
@ -82,7 +83,8 @@ static void get_SIMD_instruction_set(char* instruction_set) {
else if (__builtin_cpu_supports("mmx")) strcpy(instruction_set, "MMX");
else
#endif
strcpy(instruction_set, "unsupported");
#endif
strcpy(instruction_set, "no");
}