Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'

* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
  configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:
	configure

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

1 files changed, 2 insertions, 2 deletions

diff --git a/configure b/configure
index 0f666f133b..f37f3e4ce9 100755
--- a/configure
+++ b/configure
@@ -1454,7 +1454,7 @@ ARCH_EXT_LIST_X86='
     amd3dnowext
     avx
     avx2
-    xop
+    cpunop
     fma4
     i686
     mmx
@@ -1465,6 +1465,7 @@ ARCH_EXT_LIST_X86='
     sse4
     sse42
     ssse3
+    xop
 '
 
 ARCH_EXT_LIST="
@@ -1548,7 +1549,6 @@ HAVE_LIST="
     clock_gettime
     closesocket
     CommandLineToArgvW
-    cpunop
     CryptGenRandom
     dcbzl
     dev_bktr_ioctl_bt848_h