Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 11:52:05 +0000 (13:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 11:52:09 +0000 (13:52 +0200)
* commit '84146963d23d76b09af633e97413cd97d9b3021e':
  configure: x86: Fix handling of i686 and cpunop features

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

diff --cc configure
+++ b/configure
@@@ -1458,10 -1289,8 +1459,9 @@@ HAVE_LIST=
      getrusage
      getservbyport
      gettimeofday
 +    glob
      gnu_as
      gsm_h
-     i686
      ibm_asm
      inet_aton
      io_h
              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 avresample
          check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
-         check_yasm "CPU amdnop" && enabled i686 && enable cpunop
+         check_yasm "CPU amdnop" && enable cpunop
      fi
  
      case "$cpu" in