Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'

* commit '84bf8817206126dab3c9abf6055b593389bcb241':
  configure: Split x86 SIMD architecture extensions into separate list

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index f8ad270,6572e4e..d19799c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1456,10 -1254,9 +1456,8 @@@ ARCH_EXT_LIST_X86_SIMD=
      amd3dnowext
      avx
      avx2
-     cpunop
 -    xop
      fma3
      fma4
-     i686
      mmx
      mmxext
      sse
@@@ -1468,9 -1265,14 +1466,15 @@@
      sse4
      sse42
      ssse3
 +    xop
  '
  
+ ARCH_EXT_LIST_X86="
+     $ARCH_EXT_LIST_X86_SIMD
+     cpunop
+     i686
+ "
+ 
  ARCH_EXT_LIST="
      $ARCH_EXT_LIST_ARM
      $ARCH_EXT_LIST_X86