summaryrefslogtreecommitdiff
path: root/libavutil/arm
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2017-05-03 11:18:51 +0300
committerMartin Storsjö <martin@martin.st>2017-05-08 14:21:08 +0300
commit59cee42d7d22530e66a155305389e29679b11f78 (patch)
tree2e9081d4aed7de859b2cc1da0ed5e22df861a1eb /libavutil/arm
parentce080f47b8b55ab3d41eb00487b138d9906d114d (diff)
downloadffmpeg-59cee42d7d22530e66a155305389e29679b11f78.tar.gz
arm: Check for the .arch directive in configure
When targeting windows, the .arch directive isn't available. So far, when building for windows, we've always used gas-preprocessor, both when using msvc's armasm and when using clang. Lately, clang/llvm has implemented the last missing piece (altmacro support) for building our assembly without gas-preprocessor. This means that we now build for arm/windows with clang without any extra compatibility layer. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil/arm')
-rw-r--r--libavutil/arm/asm.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index a791e80c57..08574852b5 100644
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -46,6 +46,7 @@
# define FPU @
#endif
+#if HAVE_AS_ARCH_DIRECTIVE
#if HAVE_NEON
.arch armv7-a
#elif HAVE_ARMV6T2
@@ -55,6 +56,7 @@
#elif HAVE_ARMV5TE
.arch armv5te
#endif
+#endif
#if HAVE_AS_OBJECT_ARCH
ELF .object_arch armv4
#endif