diff options
| author | Martin Storsjö <martin@martin.st> | 2015-03-05 23:38:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:09 +0200 |
| commit | b13cba308253cb76c500c0425f7569f4a43131b1 (patch) | |
| tree | 09bf2d75a2a93919031a2bcb375b3cb94cd15692 | |
| parent | 46ee330d3a1e84034aadbaede606c1722210a8ff (diff) | |
| download | ffmpeg-b13cba308253cb76c500c0425f7569f4a43131b1.tar.gz | |
arm: Suppress tags about used cpu arch and extensions
When all the codepaths using manually set .arch/.fpu code is
behind runtime detection, the elf attributes should be suppressed.
This allows tools to know that the final built binary doesn't
strictly require these extensions.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73
and b77e335e441040a40fc6156b8e4a134745d10233)
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 9841654c158c80e9d525ba03754135d3f34e306e)
Signed-off-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
@@ -1415,6 +1415,7 @@ HAVE_LIST=" alsa_asoundlib_h altivec_h arpa_inet_h + as_object_arch asm_mod_q asm_mod_y asm_types_h @@ -3831,6 +3832,11 @@ EOF [ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_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 9cdcce9a18..0d9fb2c868 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 |