Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'

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

Conflicts:
	configure

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

configure

@@ -1451,15 +1451,13 @@ ARCH_EXT_LIST_ARM='
     vfpv3
 '
 
-ARCH_EXT_LIST_X86='
+ARCH_EXT_LIST_X86_SIMD='
     amd3dnow
     amd3dnowext
     avx
     avx2
-    cpunop
     fma3
     fma4
-    i686
     mmx
     mmxext
     sse
@@ -1471,6 +1469,12 @@ ARCH_EXT_LIST_X86='
     xop
 '
 
+ARCH_EXT_LIST_X86="
+    $ARCH_EXT_LIST_X86_SIMD
+    cpunop
+    i686
+"
+
 ARCH_EXT_LIST="
     $ARCH_EXT_LIST_ARM
     $ARCH_EXT_LIST_X86
@@ -1838,7 +1842,7 @@ mmx_external_deps="yasm"
 mmx_inline_deps="inline_asm"
 mmx_suggest="mmx_external mmx_inline"
 
-for ext in $(filter_out mmx $ARCH_EXT_LIST_X86); do
+for ext in $(filter_out mmx $ARCH_EXT_LIST_X86_SIMD); do
     eval dep=\$${ext}_deps
     eval ${ext}_external_deps='"${dep}_external"'
     eval ${ext}_inline_deps='"${dep}_inline"'