RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 01:01:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '6f9e34baea4f6f484392e4e67f606a0835d07b73'

Browse Source 
* commit '6f9e34baea4f6f484392e4e67f606a0835d07b73':
  arm: Check for support for the .fpu directive

Merged-by: Clément Bœsch <cboesch@gopro.com>
This commit is contained in:
Clément Bœsch 2017-02-02 11:22:04 +01:00
commit a0860b0a38
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1993,6 +1993,7 @@ SYSTEM_FUNCS="
TOOLCHAIN_FEATURES=" TOOLCHAIN_FEATURES="
as_dn_directive as_dn_directive
as_fpu_directive
as_func as_func
as_object_arch as_object_arch
asm_mod_q asm_mod_q
@ -5311,6 +5312,9 @@ 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
EOF
check_as <<EOF && enable as_fpu_directive
.fpu neon
EOF EOF
# llvm's integrated assembler supports .object_arch from llvm 3.5 # llvm's integrated assembler supports .object_arch from llvm 3.5

10
libavutil/arm/asm.S
View File

@ -40,6 +40,12 @@
# define FUNC @ # define FUNC @
#endif #endif
#if HAVE_AS_FPU_DIRECTIVE
# define FPU
#else
# define FPU @
#endif
#if HAVE_NEON #if HAVE_NEON
.arch armv7-a .arch armv7-a
#elif HAVE_ARMV6T2 #elif HAVE_ARMV6T2
@ -54,11 +60,11 @@ ELF .object_arch armv4
#endif #endif
#if HAVE_NEON #if HAVE_NEON
.fpu neon FPU .fpu neon
ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch
ELF .eabi_attribute 12, 0 @ suppress Tag_Advanced_SIMD_arch ELF .eabi_attribute 12, 0 @ suppress Tag_Advanced_SIMD_arch
#elif HAVE_VFP #elif HAVE_VFP
.fpu vfp FPU .fpu vfp
ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch
#endif #endif

2
tests/checkasm/arm/checkasm.S
View File

@ -24,7 +24,7 @@
/* override fpu so that NEON instructions are rejected */ /* override fpu so that NEON instructions are rejected */
#if HAVE_VFP #if HAVE_VFP
.fpu vfp FPU .fpu vfp
ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch
#endif #endif