Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'

* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0': configure: Move cpunop into ARCH_EXT_LIST_X86 Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 5176e9651b
parent 36eec03211 2b0bb69997
commit 5176e9651b
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -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