har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '59cee42d7d22530e66a155305389e29679b11f78'

Browse Source 
* commit '59cee42d7d22530e66a155305389e29679b11f78':
  arm: Check for the .arch directive in configure

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-30 20:04:46 -03:00
commit 71bf534dd6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -2052,6 +2052,7 @@ SYSTEM_FUNCS="
" "
TOOLCHAIN_FEATURES=" TOOLCHAIN_FEATURES="
as_arch_directive
as_dn_directive as_dn_directive
as_fpu_directive as_fpu_directive
as_func as_func
@ -5523,6 +5524,9 @@ EOF
check_inline_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)' 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 check_as <<EOF && enable as_dn_directive
ra .dn d0.i16 ra .dn d0.i16
.unreq ra .unreq ra

2
libavutil/arm/asm.S
View File

@ -46,6 +46,7 @@
# define FPU @ # define FPU @
#endif #endif
#if HAVE_AS_ARCH_DIRECTIVE
#if HAVE_NEON #if HAVE_NEON
.arch armv7-a .arch armv7-a
#elif HAVE_ARMV6T2 #elif HAVE_ARMV6T2
@ -55,6 +56,7 @@
#elif HAVE_ARMV5TE #elif HAVE_ARMV5TE
.arch armv5te .arch armv5te
#endif #endif
#endif
#if HAVE_AS_OBJECT_ARCH #if HAVE_AS_OBJECT_ARCH
ELF .object_arch armv4 ELF .object_arch armv4
#endif #endif