From owner-svn-src-all@FreeBSD.ORG  Fri Oct 26 16:30:50 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0F9C3A4E;
 Fri, 26 Oct 2012 16:30:50 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id EBCCB8FC08;
 Fri, 26 Oct 2012 16:30:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9QGUnls039994;
 Fri, 26 Oct 2012 16:30:49 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9QGUnM4039992;
 Fri, 26 Oct 2012 16:30:49 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201210261630.q9QGUnM4039992@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 26 Oct 2012 16:30:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r242143 -
 stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Oct 2012 16:30:50 -0000

Author: dim
Date: Fri Oct 26 16:30:49 2012
New Revision: 242143
URL: http://svn.freebsd.org/changeset/base/242143

Log:
  MFC r241895:
  
  Pull in r165878 from upstream llvm trunk:
  
    X86: Disable long nops for all cpus prior to pentiumpro/i686.
  
  This is the safest approach for now.  If you think long nops matter a
  lot for performance, compile with -march=i686 or higher. :)

Modified:
  stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)

Modified: stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
==============================================================================
--- stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp	Fri Oct 26 16:07:53 2012	(r242142)
+++ stable/9/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp	Fri Oct 26 16:30:49 2012	(r242143)
@@ -307,7 +307,9 @@ bool X86AsmBackend::writeNopData(uint64_
   };
 
   // This CPU doesnt support long nops. If needed add more.
-  if (CPU == "geode") {
+  // FIXME: Can we get this from the subtarget somehow?
+  if (CPU == "generic" || CPU == "i386" || CPU == "i486" || CPU == "i586" ||
+      CPU == "pentium" || CPU == "pentium-mmx" || CPU == "geode") {
     for (uint64_t i = 0; i < Count; ++i)
       OW->Write8(0x90);
     return true;