From 3e08ccc7d0865c9766b1a185bcbcbd6533a7b89b Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Wed, 19 Oct 2016 17:30:40 +0000 Subject: [PATCH] [Myriad] Find libc++ headers next to clang binary git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@284617 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 22 +++++++++++++--------- test/Driver/myriad-toolchain.c | 7 +++++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 1afe6e4525..558f47306b 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -5130,15 +5130,19 @@ void MyriadToolChain::AddClangCXXStdlibIncludeArgs( DriverArgs.hasArg(options::OPT_nostdincxx)) return; - // Only libstdc++, for now. - StringRef LibDir = GCCInstallation.getParentLibPath(); - const GCCVersion &Version = GCCInstallation.getVersion(); - StringRef TripleStr = GCCInstallation.getTriple().str(); - const Multilib &Multilib = GCCInstallation.getMultilib(); - - addLibStdCXXIncludePaths( - LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text, - "", TripleStr, "", "", Multilib.includeSuffix(), DriverArgs, CC1Args); + if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) { + std::string Path(getDriver().getInstalledDir()); + Path += "/../include/c++/v1"; + addSystemInclude(DriverArgs, CC1Args, Path); + } else { + StringRef LibDir = GCCInstallation.getParentLibPath(); + const GCCVersion &Version = GCCInstallation.getVersion(); + StringRef TripleStr = GCCInstallation.getTriple().str(); + const Multilib &Multilib = GCCInstallation.getMultilib(); + addLibStdCXXIncludePaths( + LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text, + "", TripleStr, "", "", Multilib.includeSuffix(), DriverArgs, CC1Args); + } } // MyriadToolChain handles several triples: diff --git a/test/Driver/myriad-toolchain.c b/test/Driver/myriad-toolchain.c index f436107015..e7de6a8fe5 100644 --- a/test/Driver/myriad-toolchain.c +++ b/test/Driver/myriad-toolchain.c @@ -69,8 +69,11 @@ // RUN: | FileCheck %s -check-prefix=PREPROCESS // PREPROCESS: "-E" "-DMYRIAD2" "-I" "foo" -// RUN: %clang -target sparc-myriad -### --driver-mode=g++ %s 2>&1 | FileCheck %s --check-prefix=STDLIBCXX -// STDLIBCXX: "-lstdc++" "-lc" "-lgcc" +// RUN: %clang -target sparc-myriad -### --driver-mode=g++ %s 2>&1 | FileCheck %s --check-prefix=LIBSTDCXX +// LIBSTDCXX: "-lstdc++" "-lc" "-lgcc" + +// RUN: %clang -stdlib=libc++ -### -target sparcel-myriad -S -x c++ %s 2>&1 | FileCheck %s -check-prefix=LIBCXX +// LIBCXX: "-internal-isystem" "{{.*}}/../include/c++/v1" // RUN: %clang -target sparc-myriad -### -nostdlib %s 2>&1 | FileCheck %s --check-prefix=NOSTDLIB // NOSTDLIB-NOT: crtbegin.o -- 2.40.0