summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-02-18 00:40:06 +0200
committerMartin Storsjö <martin@martin.st>2015-03-07 17:10:08 +0200
commitdcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73 (patch)
treee6b35f658d8455f8ed30247355f87479d2d60957
parentcecf45b2bfbb85e9e59f355428fbd4d8cbc652a8 (diff)
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>
-rwxr-xr-xconfigure6
-rw-r--r--libavutil/arm/asm.S6
2 files changed, 12 insertions, 0 deletions
diff --git a/configure b/configure
index 0e182b484f..59438b833e 100755
--- a/configure
+++ b/configure
@@ -1494,6 +1494,7 @@ SYSTEM_FUNCS="
TOOLCHAIN_FEATURES="
as_dn_directive
as_func
+ as_object_arch
asm_mod_q
attribute_may_alias
attribute_packed
@@ -3869,6 +3870,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 8479304f5f..943c1cea3f 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