Merge commit '450b02307cb631f501793b52b98b610c3a54378b' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:26:52 +0000 (00:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:26:52 +0000 (00:26 +0100)
* commit '450b02307cb631f501793b52b98b610c3a54378b':
  arm: Suppress tags about used cpu arch and extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavutil/arm/asm.S

diff --cc configure
+++ b/configure
@@@ -4425,6 -3819,6 +4426,11 @@@ if enabled_any arm aarch64 || enabled_a
  .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"'
Simple merge