ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Oct 30 20:04:46 2017 -0300| [71bf534dd682ee89f2240b9bd2716e13d8aed6f5] | committer: James Almer
Merge commit '59cee42d7d22530e66a155305389e29679b11f78' * commit '59cee42d7d22530e66a155305389e29679b11f78': arm: Check for the .arch directive in configure Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71bf534dd682ee89f2240b9bd2716e13d8aed6f5 --- configure | 4 ++++ libavutil/arm/asm.S | 2 ++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 0414347e3b..ea22d692b9 100755 --- a/configure +++ b/configure @@ -2052,6 +2052,7 @@ SYSTEM_FUNCS=" " TOOLCHAIN_FEATURES=" + as_arch_directive as_dn_directive as_fpu_directive as_func @@ -5523,6 +5524,9 @@ EOF check_inline_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)' + check_as <<EOF && enable as_arch_directive +.arch armv7-a +EOF check_as <<EOF && enable as_dn_directive ra .dn d0.i16 .unreq ra diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 7d33a64fac..eb689a1039 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 ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
