meson: store ARM SIMD and NEON tests as text files

This is unfortunately required to make the tests work correctly, as
otherwise meson assumes that the files are C code not assembly. I've
opened https://github.com/mesonbuild/meson/issues/5151, to discuss
fixing the issue in meson upstream.

Fixes #29

diff --git a/arm-simd-test.S b/arm-simd-test.S
new file mode 100644 (file)
index 0000000..910c814
--- /dev/null
+++ b/arm-simd-test.S
@@ -0,0 +1,10 @@
+.text
+.arch armv6
+.object_arch armv4
+.arm
+.altmacro
+#ifndef __ARM_EABI__
+#error EABI is required (to be sure that calling conventions are compatible)
+#endif
+pld [r0]
+uqadd8 r0, r0, r0

diff --git a/meson.build b/meson.build
index 6b247d865a0a3aa7399abfd0c5fc6a4b7617700c..7bfbd9900fb609df95dc4966f16fec21d2330161 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -224,20 +224,7 @@ use_armv6_simd = get_option('arm-simd')
 have_armv6_simd = false
 if not use_armv6_simd.disabled()
   if host_machine.cpu_family() == 'arm'
-    if cc.compiles('''
-        .text
-        .arch armv6
-        .object_arch armv4
-        .arm
-        .altmacro
-        #ifndef __ARM_EABI__
-        #error EABI is required (to be sure that calling conventions are compatible)
-        #endif
-        pld [r0]
-        uqadd8 r0, r0, r0
-        ''',
-        args : ['-x assembler-with-cpp'],
-        name : 'ARMv6 SIMD Intrinsic Support')
+    if cc.compiles(files('arm-simd-test.S'), name : 'ARMv6 SIMD Intrinsic Support')
       have_armv6_simd = true
     endif
   endif
@@ -253,22 +240,7 @@ use_neon = get_option('neon')
 have_neon = false
 if not use_neon.disabled()
   if host_machine.cpu_family() == 'arm'
-    if cc.compiles('''
-        .text
-        .fpu neon
-        .arch armv7a
-        .object_arch armv4
-        .eabi_attribute 10, 0
-        .arm
-        .altmacro
-        #ifndef __ARM_EABI__
-        #error EABI is required (to be sure that calling conventions are compatible)
-        #endif
-        pld [r0]
-        vmovn.u16 d0, q0
-        ''',
-        args : ['-x assembler-with-cpp'],
-        name : 'NEON Intrinsic Support')
+    if cc.compiles(files('neon-test.S'), name : 'NEON Intrinsic Support')
       have_neon = true
     endif
   endif

diff --git a/neon-test.S b/neon-test.S
new file mode 100644 (file)
index 0000000..c30a399
--- /dev/null
+++ b/neon-test.S
@@ -0,0 +1,12 @@
+.text
+.fpu neon
+.arch armv7a
+.object_arch armv4
+.eabi_attribute 10, 0
+.arm
+.altmacro
+#ifndef __ARM_EABI__
+#error EABI is required (to be sure that calling conventions are compatible)
+#endif
+pld [r0]
+vmovn.u16 d0, q0