From 2c2c48a9bdbef51177204dfc2f151f3be257f9b8 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 26 Apr 2013 16:49:03 +0200
Subject: [PATCH] configure: x86: Only enable cpunop on i686

The assembler may insert nopl instructions for cpunop, which are not
(universally) supported on i586 CPUs.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 5e8e70e962..b67a8bf10c 100755
--- a/configure
+++ b/configure
@@ -3431,7 +3431,7 @@ EOF
         check_yasm "vextractf128 xmm0, ymm0, 0" && enable yasm ||
             die "yasm not found, use --disable-yasm for a crippled build"
         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