portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix blake3 build with incompatible assemblers (#3764)

Browse source 
Apple Clang 4.2 on Mac OS X 10.7 Lion does support avx2, but it has
issues with some of the asm syntax used, in particular jc and some mov
syntax.
So we add an additional check for a short assembly snippet.
This commit is contained in:
Florian Märkl 2023-08-17 03:51:57 +02:00 committed by GitHub
parent 061c56f4c4
commit d8aeabb501
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
subprojects/packagefiles/blake3/meson.build
View file

@ -79,7 +79,9 @@ is_x64 = target_machine.cpu_family() == 'x86_64'
is_arm = target_machine.cpu_family() == 'aarch64'
has_intrins = cc.has_header('immintrin.h')
has_simd = false
if has_intrins and is_arm
has_simd = true
has_neon = cc.compiles(simd_neon, args: [], name: 'neon')
if has_neon
blake3_files += 'c' / 'blake3_neon.c'
@ -88,17 +90,22 @@ if has_intrins and is_arm
add_project_arguments('-DBLAKE3_USE_NEON=0', language: 'c')
endif
elif has_intrins and is_x64
has_simd = true
if target_machine.system() == 'windows'
if cc.get_id() == 'msvc'
blake3_simd = win_msvc_asm
else # gcc or clang
blake3_simd = win_gnu_asm
endif
else # unix only
elif cc.compiles(files('unix_syntax_check.S')[0], args: [], name: 'asm_syntax') # unix only, check if the compiler supports the used asm syntax
blake3_simd = unix_asm
else
has_simd = false
endif
add_project_arguments('-DBLAKE3_USE_NEON=0', language: 'c')
else
endif
if not has_simd
# since we do not support SIMD we just use the portable code.
blake3_flags = [
'-DBLAKE3_NO_SSE2',

30
subprojects/packagefiles/blake3/unix_syntax_check.S Normal file
View file

@ -0,0 +1,30 @@
#if defined(__ELF__) && defined(__linux__)
.section .note.GNU-stack,"",%progbits
#endif
#if defined(__ELF__) && defined(__CET__) && defined(__has_include)
#if __has_include(<cet.h>)
#include <cet.h>
#endif
#endif
#if !defined(_CET_ENDBR)
#define _CET_ENDBR
#endif
.intel_syntax noprefix
.global _blake3_hash_many_avx2
.global blake3_hash_many_avx2
#ifdef __APPLE__
.text
#else
.section .text
#endif
.p2align 6
mov r10d, dword ptr [rsp+0x110+8*rax]
jc 3f
nop
nop
3:
nop
nop