From owner-svn-src-stable-9@FreeBSD.ORG  Sat Oct 13 12:56:05 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6D84A5B4;
 Sat, 13 Oct 2012 12:56:05 +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 5504F8FC0A;
 Sat, 13 Oct 2012 12:56:05 +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 q9DCu57i016872;
 Sat, 13 Oct 2012 12:56:05 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9DCu5og016869;
 Sat, 13 Oct 2012 12:56:05 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201210131256.q9DCu5og016869@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 13 Oct 2012 12:56:05 +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: r241505 - in stable/9/contrib/llvm/lib: Support Target/X86
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Oct 2012 12:56:05 -0000

Author: dim
Date: Sat Oct 13 12:56:04 2012
New Revision: 241505
URL: http://svn.freebsd.org/changeset/base/241505

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

Modified:
  stable/9/contrib/llvm/lib/Support/Host.cpp
  stable/9/contrib/llvm/lib/Target/X86/X86.td
Directory Properties:
  stable/9/contrib/llvm/   (props changed)

Modified: stable/9/contrib/llvm/lib/Support/Host.cpp
==============================================================================
--- stable/9/contrib/llvm/lib/Support/Host.cpp	Sat Oct 13 11:23:16 2012	(r241504)
+++ stable/9/contrib/llvm/lib/Support/Host.cpp	Sat Oct 13 12:56:04 2012	(r241505)
@@ -284,6 +284,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: stable/9/contrib/llvm/lib/Target/X86/X86.td
==============================================================================
--- stable/9/contrib/llvm/lib/Target/X86/X86.td	Sat Oct 13 11:23:16 2012	(r241504)
+++ stable/9/contrib/llvm/lib/Target/X86/X86.td	Sat Oct 13 12:56:04 2012	(r241505)
@@ -227,6 +227,7 @@ def : Proc<"bdver2",          [FeatureSS
                                FeatureAES, FeatureCLMUL,
                                FeatureXOP, FeatureF16C, FeatureLZCNT,
                                FeaturePOPCNT, FeatureBMI]>;
+def : Proc<"geode",           [Feature3DNowA]>;
 
 def : Proc<"winchip-c6",      [FeatureMMX]>;
 def : Proc<"winchip2",        [Feature3DNow]>;