AnotherFoxGuy/webrtc-audio-processing
1
0
Fork 0
Code Pull Requests Activity

build/meson: fix compilation on arm64

Browse Source 
The assembly files used don't use the right comments for arm64
This commit is contained in:
Matthew Waters 2018-11-05 22:49:46 +11:00
parent 682857751b
commit 27e93ee86b
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -47,21 +47,25 @@ have_arm = false
have_armv7 = false have_armv7 = false
have_neon = false have_neon = false
have_x86 = false have_x86 = false
if ['arm', 'armv7', 'aarch64'].contains(host_machine.cpu_family()) if ['arm', 'armv7'].contains(host_machine.cpu_family())
if cc.compiles('''#ifdef __ARM_ARCH_ISA_ARM
#error no arm arch
#endif''')
have_arm = true have_arm = true
arch_cflags = ['-DWEBRTC_ARCH_ARM'] arch_cflags += ['-DWEBRTC_ARCH_ARM']
endif
if cc.compiles('''#ifndef __ARM_ARCH_7A__ if cc.compiles('''#ifndef __ARM_ARCH_7A__
#error no armv7 arch #error no armv7 arch
#endif''') #endif''')
have_armv7 = true have_armv7 = true
arch_cflags = ['-DWEBRTC_ARCH_ARM_V7'] arch_cflags += ['-DWEBRTC_ARCH_ARM_V7']
endif endif
if cc.compiles('''#ifndef __aarch64__ endif
if cc.compiles('''#ifndef __aarch64__
#error no aarch64 arch #error no aarch64 arch
#endif''') #endif''')
have_neon = true have_neon = true
arch_cflags = ['-DWEBRTC_ARCH_ARM64', '-DWEBRTC_HAS_NEON'] arch_cflags += ['-DWEBRTC_ARCH_ARM64', '-DWEBRTC_HAS_NEON']
endif
endif endif
if ['x86', 'x86_64'].contains(host_machine.cpu_family()) if ['x86', 'x86_64'].contains(host_machine.cpu_family())
have_x86 = true have_x86 = true