diff options
| author | Martin Storsjö <martin@martin.st> | 2015-03-05 23:38:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 01:52:52 +0100 |
| commit | 51b911e948529a23ba6f942fc621ed4def62086b (patch) | |
| tree | cc9563c88f304734df36e48ac68a40f90e4cb326 | |
| parent | bb508ddb8b7099d69ffea412229960c8d3007fae (diff) | |
| download | ffmpeg-51b911e948529a23ba6f942fc621ed4def62086b.tar.gz | |
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>
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -4464,11 +4464,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"' @@ -4527,6 +4522,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 |