From owner-svn-src-head@FreeBSD.ORG  Thu May  5 16:14:14 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03515106566B;
	Thu,  5 May 2011 16:14:14 +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 E25238FC0A;
	Thu,  5 May 2011 16:14:13 +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 p45GEDvG006826;
	Thu, 5 May 2011 16:14:13 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p45GEDEg006824;
	Thu, 5 May 2011 16:14:13 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201105051614.p45GEDEg006824@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 5 May 2011 16:14:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221503 - head/contrib/llvm/lib/Support/Unix
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 05 May 2011 16:14:14 -0000

Author: dim
Date: Thu May  5 16:14:13 2011
New Revision: 221503
URL: http://svn.freebsd.org/changeset/base/221503

Log:
  Make cross-compiling using clang work better, by respecting the
  LLVM_HOSTTRIPLE that is defined during the cross-tools stage.
  
  Using clang, you can now build amd64 world and kernel on i386, and vice
  versa.  Other arches still need work.

Modified:
  head/contrib/llvm/lib/Support/Unix/Host.inc

Modified: head/contrib/llvm/lib/Support/Unix/Host.inc
==============================================================================
--- head/contrib/llvm/lib/Support/Unix/Host.inc	Thu May  5 14:45:24 2011	(r221502)
+++ head/contrib/llvm/lib/Support/Unix/Host.inc	Thu May  5 16:14:13 2011	(r221503)
@@ -35,6 +35,9 @@ static std::string getOSVersion() {
 }
 
 std::string sys::getHostTriple() {
+#ifdef __FreeBSD__
+  return LLVM_HOSTTRIPLE;
+#else
   // FIXME: Derive directly instead of relying on the autoconf generated
   // variable.
 
@@ -91,4 +94,5 @@ std::string sys::getHostTriple() {
   }
 
   return Triple;
+#endif
 }