Merge commit '7ebdffc353f3f0827864e8e3461fdc00cc243b14'

[ffmpeg] / libavutil / arm / asm.S

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index b0a6e50a3d010f9cc136e9e37e33ab22d322dc29..f4882899ee568ca5abfd52a911a556ff054c6e4e 100644 (file)
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -40,6 +40,12 @@
 #   define FUNC @
 #endif
 
+#if HAVE_AS_FPU_DIRECTIVE
+#   define FPU
+#else
+#   define FPU @
+#endif
+
 #if   HAVE_NEON
         .arch           armv7-a
 #elif HAVE_ARMV6T2
@@ -54,11 +60,11 @@ ELF     .object_arch    armv4
 #endif
 
 #if   HAVE_NEON
-        .fpu            neon
+FPU     .fpu            neon
 ELF     .eabi_attribute 10, 0           @ suppress Tag_FP_arch
 ELF     .eabi_attribute 12, 0           @ suppress Tag_Advanced_SIMD_arch
 #elif HAVE_VFP
-        .fpu            vfp
+FPU     .fpu            vfp
 ELF     .eabi_attribute 10, 0           @ suppress Tag_FP_arch
 #endif