From owner-svn-src-head@FreeBSD.ORG  Wed Oct 10 21:29:01 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6CAD5CC3;
 Wed, 10 Oct 2012 21:29:01 +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 567288FC1C;
 Wed, 10 Oct 2012 21:29:01 +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 q9ALT1Ri005299;
 Wed, 10 Oct 2012 21:29:01 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9ALT1sf005296;
 Wed, 10 Oct 2012 21:29:01 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201210102129.q9ALT1sf005296@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 10 Oct 2012 21:29:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241427 - in head/contrib/llvm/lib: Support Target/X86
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Oct 2012 21:29:01 -0000

Author: dim
Date: Wed Oct 10 21:29:00 2012
New Revision: 241427
URL: http://svn.freebsd.org/changeset/base/241427

Log:
  Pull in r163710 from upstream llvm trunk:
  
    Add support for AMD Geode.
  
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Support/Host.cpp
  head/contrib/llvm/lib/Target/X86/X86.td

Modified: head/contrib/llvm/lib/Support/Host.cpp
==============================================================================
--- head/contrib/llvm/lib/Support/Host.cpp	Wed Oct 10 21:27:30 2012	(r241426)
+++ head/contrib/llvm/lib/Support/Host.cpp	Wed Oct 10 21:29:00 2012	(r241427)
@@ -303,6 +303,7 @@ std::string sys::getHostCPUName() {
         case 8:  return "k6-2";
         case 9:
         case 13: return "k6-3";
+        case 10: return "geode";
         default: return "pentium";
         }
       case 6:

Modified: head/contrib/llvm/lib/Target/X86/X86.td
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86.td	Wed Oct 10 21:27:30 2012	(r241426)
+++ head/contrib/llvm/lib/Target/X86/X86.td	Wed Oct 10 21:29:00 2012	(r241427)
@@ -227,6 +227,7 @@ def : Proc<"bdver2",          [FeatureXO
                                FeatureAES, FeaturePCLMUL,
                                FeatureF16C, FeatureLZCNT,
                                FeaturePOPCNT, FeatureBMI, FeatureFMA]>;
+def : Proc<"geode",           [Feature3DNowA]>;
 
 def : Proc<"winchip-c6",      [FeatureMMX]>;
 def : Proc<"winchip2",        [Feature3DNow]>;