From owner-svn-src-head@FreeBSD.ORG  Tue Mar 11 21:43:11 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 40875ABA;
 Tue, 11 Mar 2014 21:43:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2CB747A4;
 Tue, 11 Mar 2014 21:43:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BLhB0h004802;
 Tue, 11 Mar 2014 21:43:11 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BLhBcH004801;
 Tue, 11 Mar 2014 21:43:11 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403112143.s2BLhBcH004801@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 11 Mar 2014 21:43:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263049 - head/contrib/llvm/tools/clang/lib/Frontend
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.17
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: Tue, 11 Mar 2014 21:43:11 -0000

Author: dim
Date: Tue Mar 11 21:43:10 2014
New Revision: 263049
URL: http://svnweb.freebsd.org/changeset/base/263049

Log:
  Garbage collect the old way of adding the libstdc++ include directories
  in clang's InitHeaderSearch.cpp.  This has been superseded by David
  Chisnall's commit in r255321.
  
  Moreover, if libc++ is used, the libstdc++ include directories should
  not be in the search path at all.  These directories are now only used
  if you pass -stdlib=libstdc++.
  
  MFC after:	3 days
  X-MFC-With:	r261991

Modified:
  head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp

Modified: head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Tue Mar 11 21:11:43 2014	(r263048)
+++ head/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Tue Mar 11 21:43:10 2014	(r263049)
@@ -427,14 +427,6 @@ AddDefaultCPlusPlusIncludePaths(const ll
     else
       AddPath("/usr/include/c++/4.4", CXXSystem, false);
     break;
-  case llvm::Triple::FreeBSD:
-    // FreeBSD 8.0
-    // FreeBSD 7.3
-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2",
-                                "", "", "", triple);
-    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2/backward",
-                                "", "", "", triple);
-    break;
   case llvm::Triple::OpenBSD: {
     std::string t = triple.getTriple();
     if (t.substr(0, 6) == "x86_64")