diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:44:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:44:40 +0100 |
| commit | dec5586bc7340e4aeca86f22c64846767814a8f2 (patch) | |
| tree | 1c060dc6d8555a3630826bcf69a14bc7d1694896 | |
| parent | c5587516ca9155d575b9dd584ea746ebc2e333bd (diff) | |
| parent | 9841654c158c80e9d525ba03754135d3f34e306e (diff) | |
| download | ffmpeg-dec5586bc7340e4aeca86f22c64846767814a8f2.tar.gz | |
Merge commit '9841654c158c80e9d525ba03754135d3f34e306e' into release/1.1
* commit '9841654c158c80e9d525ba03754135d3f34e306e':
arm: Suppress tags about used cpu arch and extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavutil/arm/asm.S | 6 |
2 files changed, 12 insertions, 0 deletions
@@ -1365,6 +1365,7 @@ HAVE_LIST=" alsa_asoundlib_h altivec_h arpa_inet_h + as_object_arch asm_mod_q asm_mod_y asm_types_h @@ -3564,6 +3565,11 @@ EOF enabled_all armv6t2 shared !pic && enable_pic + # llvm's integrated assembler supports .object_arch from llvm 3.5 + [ "$objformat" = elf ] && check_as <<EOF && enable as_object_arch +.object_arch armv4 +EOF + elif enabled mips; then check_inline_asm loongson '"dmult.g $1, $2, $3"' diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 94229da839..4d2a32e934 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -43,11 +43,17 @@ #elif HAVE_ARMV5TE .arch armv5te #endif +#if HAVE_AS_OBJECT_ARCH +ELF .object_arch armv4 +#endif #if HAVE_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 .fpu vfp +ELF .eabi_attribute 10, 0 @ suppress Tag_FP_arch #endif .syntax unified |