Commit 27e93ee8 authored by Matthew Waters's avatar Matthew Waters 🐨
Browse files

build/meson: fix compilation on arm64

The assembly files used don't use the right comments for arm64
parent 68285775
...@@ -47,21 +47,25 @@ have_arm = false ...@@ -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())
have_arm = true if cc.compiles('''#ifdef __ARM_ARCH_ISA_ARM
arch_cflags = ['-DWEBRTC_ARCH_ARM'] #error no arm arch
have_arm = true
arch_cflags += ['-DWEBRTC_ARCH_ARM']
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
if ['x86', 'x86_64'].contains(host_machine.cpu_family()) if ['x86', 'x86_64'].contains(host_machine.cpu_family())
have_x86 = true have_x86 = true
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment