From b70553f08e34c1c739673de84fa8dbe308a27fea Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 8 Sep 2008 12:01:48 -0700
Subject: [PATCH] --- yaml --- r: 113310 b: refs/heads/master c:
 28f7e66fc1da53997a545684b21b91fb3ca3f321 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/Makefile_32.cpu | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 447259a7a932..a97898581b1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43789e21638626d826c0e8d62e50ceb76b9d61ed
+refs/heads/master: 28f7e66fc1da53997a545684b21b91fb3ca3f321
diff --git a/trunk/arch/x86/Makefile_32.cpu b/trunk/arch/x86/Makefile_32.cpu
index e372b584e919..b72b4f753113 100644
--- a/trunk/arch/x86/Makefile_32.cpu
+++ b/trunk/arch/x86/Makefile_32.cpu
@@ -45,3 +45,8 @@ cflags-$(CONFIG_MGEODEGX1)	+= -march=pentium-mmx
 # cpu entries
 cflags-$(CONFIG_X86_GENERIC) 	+= $(call tune,generic,$(call tune,i686))
 
+# Bug fix for binutils: this option is required in order to keep
+# binutils from generating NOPL instructions against our will.
+ifneq ($(CONFIG_X86_P6_NOP),y)
+cflags-y			+= $(call cc-option,-Wa$(comma)-mtune=generic32,)
+endif