RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '450b02307cb631f501793b52b98b610c3a54378b' into release/2.4 

* commit '450b02307cb631f501793b52b98b610c3a54378b':
  arm: Suppress tags about used cpu arch and extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-09 00:26:52 +01:00
parent 61b5dee49e 450b02307c
commit 0abd926d64
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1742,6 +1742,7 @@ SYSTEM_FUNCS="
TOOLCHAIN_FEATURES=" TOOLCHAIN_FEATURES="
as_dn_directive as_dn_directive
as_func as_func
as_object_arch
asm_mod_q asm_mod_q
attribute_may_alias attribute_may_alias
attribute_packed attribute_packed
@ -4424,6 +4425,11 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
check_as <<EOF && enable as_func check_as <<EOF && enable as_func
.func test .func test
.endfunc .endfunc
EOF
# llvm's integrated assembler supports .object_arch from llvm 3.5
enabled arm && test "$objformat" = elf && check_as <<EOF && enable as_object_arch
.object_arch armv4
EOF EOF
fi fi

6
libavutil/arm/asm.S
View File

@ -49,11 +49,17 @@
#elif HAVE_ARMV5TE #elif HAVE_ARMV5TE
.arch armv5te .arch armv5te
#endif #endif
#if HAVE_AS_OBJECT_ARCH
ELF .object_arch armv4
#endif
#if HAVE_NEON #if HAVE_NEON
.fpu neon .fpu neon
ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch
ELF .eabi_attribute 12, 0 @ suppress Tag_Advanced_SIMD_arch
#elif HAVE_VFP #elif HAVE_VFP
.fpu vfp .fpu vfp
ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch
#endif #endif
.syntax unified .syntax unified