[pulseaudio-commits] [Git][pulseaudio/webrtc-audio-processing][master] build/meson: fix compilation on arm64

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / webrtc-audio-processing


Commits:
27e93ee8 by Matthew Waters at 2018-11-08T09:56:52Z
build/meson: fix compilation on arm64

The assembly files used don't use the right comments for arm64

- - - - -


1 changed file:

- meson.build


Changes:

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



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/commit/27e93ee86b5ad07ff058236d9dab196b95d1e463

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/commit/27e93ee86b5ad07ff058236d9dab196b95d1e463
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20181112/1c196364/attachment-0001.html>