Module: libav Branch: master Commit: 8ee2b4672f6ad5cfd003e742f887cffcfea26021
Author: Mans Rullgard <[email protected]> Committer: Mans Rullgard <[email protected]> Date: Tue Nov 15 01:15:52 2011 +0000 ARM: add explicit .arch and .fpu directives to asm.S 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 <[email protected]> --- libavcodec/arm/asm.S | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S index a7d3ace..a124918 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -34,6 +34,22 @@ # 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 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
