[llvm-branch-commits] [cfe-branch] r354859 - Merging r354723:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Feb 26 02:28:10 2019
New Revision: 354859

URL: http://llvm.org/viewvc/llvm-project?rev=354859&view=rev
Log:
Merging r354723:
------------------------------------------------------------------------
r354723 | brad | 2019-02-23 08:21:19 +0100 (Sat, 23 Feb 2019) | 3 lines

Remove OpenBSD case for old system libstdc++ header path as OpenBSD
has switched to libc++.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_80/   (props changed)
    cfe/branches/release_80/lib/Frontend/InitHeaderSearch.cpp

Propchange: cfe/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 26 02:28:10 2019
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351579-351580,352040,352079,352099,352102,352105,352156,352221-352222,352229,352307,352323,352463,352539,352610,352672,352822,353142,353393,353402,353411,353431,353493,353495,353656,353943,353976,354035,354074,354147,354351,354721
+/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351579-351580,352040,352079,352099,352102,352105,352156,352221-352222,352229,352307,352323,352463,352539,352610,352672,352822,353142,353393,353402,353411,353431,353493,353495,353656,353943,353976,354035,354074,354147,354351,354721,354723
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_80/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_80/lib/Frontend/InitHeaderSearch.cpp?rev=354859&r1=354858&r2=354859&view=diff
==============================================================================
--- cfe/branches/release_80/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/branches/release_80/lib/Frontend/InitHeaderSearch.cpp Tue Feb 26 02:28:10 2019
@@ -433,14 +433,6 @@ void InitHeaderSearch::AddDefaultCPlusPl
   case llvm::Triple::DragonFly:
     AddPath("/usr/include/c++/5.0", CXXSystem, false);
     break;
-  case llvm::Triple::OpenBSD: {
-    std::string t = triple.getTriple();
-    if (t.substr(0, 6) == "x86_64")
-      t.replace(0, 6, "amd64");
-    AddGnuCPlusPlusIncludePaths("/usr/include/g++",
-                                t, "", "", triple);
-    break;
-  }
   case llvm::Triple::Minix:
     AddGnuCPlusPlusIncludePaths("/usr/gnu/include/c++/4.4.3",
                                 "", "", "", triple);