[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: build-sys: meson: Fixes for some ARM compiler checks

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
f515443f by Arun Raghavan at 2019-08-22T13:35:40Z
build-sys: meson: Fixes for some ARM compiler checks

- - - - -
1172daf1 by Arun Raghavan at 2019-08-22T13:35:40Z
build-sys: meson: Process subdirectories before generating configuration

Subdirectories add to the top-level cdata (specifically, the SIMD
detection happens in the pulsecore meson.build), so we were missing
HAVE_MMX/SSE2/NEON defines without this fix.

- - - - -


1 changed file:

- meson.build


Changes:

=====================================
meson.build
=====================================
@@ -430,19 +430,21 @@ elif host_machine.cpu_family() == 'arm'
   if host_machine.system() == 'linux' and get_option('atomic-arm-linux-helpers')
     cdata.set('ATOMIC_ARM_LINUX_HELPERS', 1)
   else
-    armatomictest = '''void func() {
+    armatomictest = '''int func() {
       volatile int a=0;
       int o=0, n=1, r;
-      asm volatile ("ldrex    %0, [%1]\n"
-      "subs  %0, %0, %2\n"
-      "strexeq %0, %3, [%1]\n"
-      : "=&r" (r)
-      : "r" (&a), "Ir" (o), "r" (n)
+      asm volatile (
+	      "ldrex    %0, [%1]\n"
+	      "subs  %0, %0, %2\n"
+	      "strexeq %0, %3, [%1]\n"
+	      : "=&r" (r)
+	      : "r" (&a), "Ir" (o), "r" (n)
       : "cc");
       return (a==1 ? 0 : -1);
+    }
     '''
 
-    if cc.compiles(aratomictest)
+    if cc.compiles(armatomictest)
       cdata.set('ATOMIC_ARM_INLINE_ASM', 1)
     else
       need_libatomic_ops = true
@@ -470,7 +472,7 @@ endif
 # ARM checks
 # ARMV6 instructions we need
 if host_machine.cpu_family() == 'arm'
-  armv6test = '''void func() {
+  armv6test = '''int func() {
     volatile int a = -60000, b = 0xaaaabbbb, c = 0xccccdddd;
     asm volatile ("ldr r0, %2 \n"
                   "ldr r2, %3 \n"
@@ -483,6 +485,7 @@ if host_machine.cpu_family() == 'arm'
                   : "m" (a), "m" (b), "m" (c)
                   : "r0", "r1", "r2", "r3", "cc");
     return (a == -128 && b == 0xaabbdddd) ? 0 : -1;
+  }
   '''
 
   if cc.compiles(armv6test)
@@ -671,6 +674,17 @@ endif
 
 check_dep = dependency('check', version : '>= 0.9.10', required : get_option('tests'))
 
+# Subdirs
+
+subdir('po')
+if get_option('man')
+  subdir('man')
+endif
+subdir('shell-completion/bash')
+subdir('shell-completion/zsh')
+subdir('src')
+subdir('vala')
+
 # Now generate config.h from everything above
 configure_file(output : 'config.h', configuration : cdata)
 
@@ -738,17 +752,6 @@ configure_file(
   install_dir : cmakedir,
 )
 
-# Subdirs
-
-subdir('po')
-if get_option('man')
-  subdir('man')
-endif
-subdir('shell-completion/bash')
-subdir('shell-completion/zsh')
-subdir('src')
-subdir('vala')
-
 ############################################################
 
 # Final summary



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/d830c66613eb9373fa1dc0225032963524dd70a5...1172daf19b06a4169ba26cde570566f14a3ebdf2

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/d830c66613eb9373fa1dc0225032963524dd70a5...1172daf19b06a4169ba26cde570566f14a3ebdf2
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/20190827/b62079cb/attachment-0001.html>