diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-30 20:04:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-30 20:04:46 -0300 |
| commit | 71bf534dd682ee89f2240b9bd2716e13d8aed6f5 (patch) | |
| tree | b4cd23670e999ff175d4cdf1c283a8eefd8a7c85 | |
| parent | 62d86c41b72c65116a27864d0b5c26b9762dac86 (diff) | |
| parent | 59cee42d7d22530e66a155305389e29679b11f78 (diff) | |
Merge commit '59cee42d7d22530e66a155305389e29679b11f78'
* commit '59cee42d7d22530e66a155305389e29679b11f78':
arm: Check for the .arch directive in configure
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavutil/arm/asm.S | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -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 |