Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-03-06 00:38:00 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-03-13 15:04:31 +0300
commit5a6ef7d7cb95c3a28bc936751b109239e5e4e6c1 (patch)
tree1fe748610bc15b12ee6494288a107e6ccecdeab4 /configure
parent47e8d17132b4f737a544ba777d6da99039b664a8 (diff)
configure: Move the .object_arch check to the right place
Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit b77e335e441040a40fc6156b8e4a134745d10233) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 3464d15b41..d2044fb3a1 100755
--- a/configure
+++ b/configure
@@ -4505,11 +4505,6 @@ 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"'
@@ -4568,6 +4563,11 @@ ra .dn d0.i16
.unreq ra
EOF
+ # llvm's integrated assembler supports .object_arch from llvm 3.5
+ [ "$objformat" = elf ] && check_as <<EOF && enable as_object_arch
+.object_arch armv4
+EOF
+
[ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic
elif enabled mips; then