From owner-svn-src-all@FreeBSD.ORG  Wed Oct  6 20:35:07 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A07D4106566C;
	Wed,  6 Oct 2010 20:35:07 +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 9035B8FC16;
	Wed,  6 Oct 2010 20:35:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o96KZ7GK017468;
	Wed, 6 Oct 2010 20:35:07 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o96KZ74Y017466;
	Wed, 6 Oct 2010 20:35:07 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201010062035.o96KZ74Y017466@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 6 Oct 2010 20:35:07 +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: r213492 - head/contrib/llvm/tools/clang/lib/Driver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 06 Oct 2010 20:35:07 -0000

Author: dim
Date: Wed Oct  6 20:35:07 2010
New Revision: 213492
URL: http://svn.freebsd.org/changeset/base/213492

Log:
  Apply r207674 from the clangbsd project branch:
  
  Make "clang -print-multi-os-directory" return "." on amd64, matching
  gcc's behaviour.  This is needed because some ports use the option to
  determine the installation directory for their libraries.
  
  Requested by:	kwm
  Approved by:	rpaulo (mentor)

Modified:
  head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp

Modified: head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp	Wed Oct  6 19:32:12 2010	(r213491)
+++ head/contrib/llvm/tools/clang/lib/Driver/Driver.cpp	Wed Oct  6 20:35:07 2010	(r213492)
@@ -470,7 +470,7 @@ bool Driver::HandleImmediateArgs(const C
       break;
 
     case llvm::Triple::x86_64:
-      llvm::outs() << "x86_64" << "\n";
+      llvm::outs() << "." << "\n";
       break;
 
     case llvm::Triple::ppc64: