Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 May 2013 09:36:42 +0000 (11:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 May 2013 09:36:46 +0000 (11:36 +0200)
* qatar/master:
  configure: x86: Only enable cpunop on i686

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

diff --cc configure
+++ b/configure
              elf*) enabled debug && append YASMFLAGS $yasm_debug ;;
          esac
  
 -        check_yasm "vextractf128 xmm0, ymm0, 0" && enable yasm ||
 +        check_yasm "pextrd [eax], xmm0, 1" && enable yasm ||
              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