generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '7fd11fbeeb41990427b475dc0d8800d2cf15a8c4' into release/2.2

Browse Source 
* commit '7fd11fbeeb41990427b475dc0d8800d2cf15a8c4':
  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 12:48:15 +01:00
parent 895ddf1a80 7fd11fbeeb
commit bec350611e
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -1539,6 +1539,7 @@ HAVE_LIST="
alsa_asoundlib_h alsa_asoundlib_h
altivec_h altivec_h
arpa_inet_h arpa_inet_h
as_object_arch
asm_mod_q asm_mod_q
asm_types_h asm_types_h
atomic_cas_ptr atomic_cas_ptr
@@ -4154,6 +4155,11 @@ 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)'
# llvm's integrated assembler supports .object_arch from llvm 3.5
[ "$objformat" = elf ] && check_as <<EOF && enable as_object_arch
.object_arch armv4
EOF
[ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic [ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic
elif enabled mips; then elif enabled mips; then

6
libavutil/arm/asm.S
View File

@@ -43,11 +43,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