ARM: add explicit .arch and .fpu directives to asm.S
authorMans Rullgard <mans@mansr.com>
Tue, 15 Nov 2011 01:15:52 +0000 (01:15 +0000)
committerMans Rullgard <mans@mansr.com>
Tue, 22 Nov 2011 12:13:02 +0000 (12:13 +0000)
This prevents build errors when compiler and assembler default
targets differ.  Ideally each file would declare the highest
level it requires.  This is however not easily possible as it
complicates assembling pre-armv6t2 code in Thumb-2 mode.

HAVE_NEON is used as indicator for ARMv7-A since no other
symbol exists for this and NEON is only available in this
variant.

Signed-off-by: Mans Rullgard <mans@mansr.com>
libavcodec/arm/asm.S

index a7d3ace20855a1879eeeb3d5d2260da349eb3896..a124918c1c6024ce2a99782a4e96e745a52fd1ee 100644 (file)
 #   define T @
 #endif
 
+#if   HAVE_NEON
+        .arch           armv7-a
+#elif HAVE_ARMV6T2
+        .arch           armv6t2
+#elif HAVE_ARMV6
+        .arch           armv6
+#elif HAVE_ARMV5TE
+        .arch           armv5te
+#endif
+
+#if   HAVE_NEON
+        .fpu            neon
+#elif HAVE_ARMVFP
+        .fpu            vfp
+#endif
+
         .syntax unified
 T       .thumb