diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:26:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:26:52 +0100 |
| commit | 0abd926d64a75c78e89bfc40c5398bcf45b6824b (patch) | |
| tree | cbd3aaa44aa43d9ca183fc23f72a8b26210553f5 | |
| parent | 61b5dee49e74c400647951d1b0c26bb88116efb5 (diff) | |
| parent | 450b02307cb631f501793b52b98b610c3a54378b (diff) | |
| download | ffmpeg-0abd926d64a75c78e89bfc40c5398bcf45b6824b.tar.gz | |
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>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavutil/arm/asm.S | 6 |
2 files changed, 12 insertions, 0 deletions
@@ -1742,6 +1742,7 @@ SYSTEM_FUNCS=" TOOLCHAIN_FEATURES=" as_dn_directive as_func + as_object_arch asm_mod_q attribute_may_alias attribute_packed @@ -4425,6 +4426,11 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then .func test .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 fi check_inline_asm inline_asm_labels '"1:\n"' diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 35559ce27a..30b3dc2ca5 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -49,11 +49,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 |