Merge commit 'b77e335e'

* commit 'b77e335e':
  configure: Move the .object_arch check to the right place
Merged-by: Michael Niedermayer <michaelni@gmx.at>

configure

@@ -4508,11 +4508,6 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
     check_as <<EOF && enable as_func
 .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
 
@@ -4570,6 +4565,11 @@ EOF
     check_as <<EOF && enable as_dn_directive
 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