mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-28 12:16:12 +02:00
Merge commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73'
* commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73': arm: Suppress tags about used cpu arch and extensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9a1884a10e
6
configure
vendored
6
configure
vendored
@ -1769,6 +1769,7 @@ SYSTEM_FUNCS="
|
|||||||
TOOLCHAIN_FEATURES="
|
TOOLCHAIN_FEATURES="
|
||||||
as_dn_directive
|
as_dn_directive
|
||||||
as_func
|
as_func
|
||||||
|
as_object_arch
|
||||||
asm_mod_q
|
asm_mod_q
|
||||||
attribute_may_alias
|
attribute_may_alias
|
||||||
attribute_packed
|
attribute_packed
|
||||||
@ -4507,6 +4508,11 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
|
|||||||
check_as <<EOF && enable as_func
|
check_as <<EOF && enable as_func
|
||||||
.func test
|
.func test
|
||||||
.endfunc
|
.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
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -49,11 +49,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
|
||||||
|
Loading…
Reference in New Issue
Block a user