ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Thu Feb 2 11:22:04 2017 +0100| [a0860b0a388d5471ae3e60fbf004509a3783f392] | committer: Clément Bœsch
Merge commit '6f9e34baea4f6f484392e4e67f606a0835d07b73' * commit '6f9e34baea4f6f484392e4e67f606a0835d07b73': arm: Check for support for the .fpu directive Merged-by: Clément Bœsch <cboe...@gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0860b0a388d5471ae3e60fbf004509a3783f392 --- configure | 4 ++++ libavutil/arm/asm.S | 10 ++++++++-- tests/checkasm/arm/checkasm.S | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7154142..b22c8b3 100755 --- a/configure +++ b/configure @@ -1993,6 +1993,7 @@ SYSTEM_FUNCS=" TOOLCHAIN_FEATURES=" as_dn_directive + as_fpu_directive as_func as_object_arch asm_mod_q @@ -5312,6 +5313,9 @@ EOF ra .dn d0.i16 .unreq ra EOF + check_as <<EOF && enable as_fpu_directive +.fpu neon +EOF # llvm's integrated assembler supports .object_arch from llvm 3.5 [ "$objformat" = elf ] && check_as <<EOF && enable as_object_arch diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index b0a6e50..f488289 100644 --- 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 diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S index 0cbf32e..e6b1650 100644 --- a/tests/checkasm/arm/checkasm.S +++ b/tests/checkasm/arm/checkasm.S @@ -24,7 +24,7 @@ /* override fpu so that NEON instructions are rejected */ #if HAVE_VFP -.fpu vfp +FPU .fpu vfp ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch #endif ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
