diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-07 19:40:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-07 19:41:00 +0100 |
| commit | a75353e73b8b4905283f31e0dd5cbcb9a9db2572 (patch) | |
| tree | b4133db03a9d53519b94823f94ccf467c2217190 /configure | |
| parent | 9a1884a10ecd780e92333a5719d67f6f09157a65 (diff) | |
| parent | b77e335e441040a40fc6156b8e4a134745d10233 (diff) | |
Merge commit 'b77e335e441040a40fc6156b8e4a134745d10233'
* commit 'b77e335e441040a40fc6156b8e4a134745d10233':
configure: Move the .object_arch check to the right place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -4509,11 +4509,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"' @@ -4572,6 +4567,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 |