Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: x86: Only enable cpunop on i686
Merged-by: Michael Niedermayer <michaelni@gmx.at>

configure

@@ -3797,7 +3797,7 @@ EOF
             die "yasm not found, use --disable-yasm for a crippled build"
         check_yasm "vextractf128 xmm0, ymm0, 0"      || disable avx_external
         check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
-        check_yasm "CPU amdnop" && enable cpunop
+        check_yasm "CPU amdnop" && enabled i686 && enable cpunop
     fi
 
     case "$cpu" in