<div dir="ltr"><div dir="ltr">On Tue, 21 May 2019 at 13:43, Louis Dionne via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div style="overflow-wrap: break-word;">Thanks a lot for looking into this. I was trying to reproduce in a Docker container but you were faster than me.<div><br></div><div><div>I'm not 100% sure I understand the fix, though. Am I correct that -stdlib=platform means that the standard library for the platform we're compiling for (darwin16 after your change) is what's going to be used? That would make it use libc++ for both the libc++ and the libstdc++ tests, which is the part I don't understand.</div></div></div></blockquote><div><br></div><div>It means to use the platform-specific logic to pick the default, even if CLANG_DEFAULT_CXX_STDLIB was defined at configure-time and would usually override that logic.</div><div><br></div><div>The last two checks in darwin-header-search-libstdcxx.cpp are both using libc++ (they were both using libc++ on submit on recent Darwin, and now do so portably). I think that's intentional: they seem to be checking that we don't produce a warning that we can't find the libstdc++ headers when we weren't supposed to be using libstdc++ in the first place.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div style="overflow-wrap: break-word;"><div><div>Louis<br><div><br><blockquote type="cite"><div>On May 21, 2019, at 16:08, Richard Smith <<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>> wrote:</div><br class="gmail-m_-6248338899301188891Apple-interchange-newline"><div><div dir="ltr"><div>Awesome!</div><div><br></div><div>But... this resulted in two test failures for me. I've fixed them in r361301, can you check that's correct?<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, 21 May 2019 at 10:45, Louis Dionne via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: ldionne<br>
Date: Tue May 21 10:48:04 2019<br>
New Revision: 361278<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=361278&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=361278&view=rev</a><br>
Log:<br>
[clang][Darwin] Refactor header search path logic into the driver<br>
<br>
Summary:<br>
This commit moves the logic for determining system, resource and C++<br>
header search paths from CC1 to the driver. This refactor has already<br>
been made for several platforms, but Darwin had been left behind.<br>
<br>
This refactor tries to implement the previous search path logic with<br>
perfect accuracy. In particular, the order of all include paths inside<br>
CC1 and all paths that were skipped because nonexistent are conserved<br>
after the refactor. This change was also tested against a code base<br>
of significant size and revealed no problems.<br>
<br>
Reviewers: jfb, arphaman<br>
<br>
Subscribers: nemanjai, javed.absar, kbarton, christof, jkorous, dexonsmith, jsji, cfe-commits<br>
<br>
Tags: #clang<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D61963" rel="noreferrer" target="_blank">https://reviews.llvm.org/D61963</a><br>
<br>
Added:<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/c++/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/c++/4.2.1/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/c++/4.2.1/arm64-apple-darwin10/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/c++/4.2.1/arm64-apple-darwin10/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/arm-apple-darwin10/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/arm-apple-darwin10/v6/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/arm-apple-darwin10/v6/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/arm-apple-darwin10/v7/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/arm-apple-darwin10/v7/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.0.0/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.0.0/powerpc-apple-darwin10/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.0.0/powerpc-apple-darwin10/ppc64/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.0.0/powerpc-apple-darwin10/ppc64/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.2.1/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.2.1/powerpc-apple-darwin10/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.2.1/powerpc-apple-darwin10/ppc64/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.2.1/powerpc-apple-darwin10/ppc64/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.0.0/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.0.0/i686-apple-darwin8/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.0.0/i686-apple-darwin8/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.2.1/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.2.1/i686-apple-darwin10/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.2.1/i686-apple-darwin10/x86_64/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.2.1/i686-apple-darwin10/x86_64/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/include/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/include/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/include/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/include/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/include/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/include/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/lib/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/lib/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/bin/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/bin/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/include/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/include/c++/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/include/c++/v1/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/include/c++/v1/.keep<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain_no_libcxx/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain_no_libcxx/usr/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin/<br>
cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin/.keep<br>
cfe/trunk/test/Driver/darwin-header-search-libcxx.cpp<br>
cfe/trunk/test/Driver/darwin-header-search-libstdcxx.cpp<br>
cfe/trunk/test/Driver/darwin-header-search-system.cpp<br>
Removed:<br>
cfe/trunk/test/Frontend/warning-stdlibcxx-darwin.cpp<br>
Modified:<br>
cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td<br>
cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td<br>
cfe/trunk/lib/Driver/ToolChains/Darwin.cpp<br>
cfe/trunk/lib/Driver/ToolChains/Darwin.h<br>
cfe/trunk/lib/Frontend/InitHeaderSearch.cpp<br>
cfe/trunk/test/Driver/darwin-stdlib.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=361278&r1=361277&r2=361278&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=361278&r1=361277&r2=361278&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td Tue May 21 10:48:04 2019<br>
@@ -453,4 +453,9 @@ def warn_drv_msp430_hwmult_no_device : W<br>
"specify a MSP430 device, or -mhwmult to set hardware multiply type "<br>
"explicitly.">, InGroup<InvalidCommandLineArgument>;<br>
<br>
+def warn_drv_libstdcxx_not_found : Warning<<br>
+ "include path for libstdc++ headers not found; pass '-stdlib=libc++' on the "<br>
+ "command line to use the libc++ standard library instead">,<br>
+ InGroup<DiagGroup<"stdlibcxx-not-found">>;<br>
+<br>
}<br>
<br>
Modified: cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td?rev=361278&r1=361277&r2=361278&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td?rev=361278&r1=361277&r2=361278&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticFrontendKinds.td Tue May 21 10:48:04 2019<br>
@@ -232,11 +232,6 @@ def err_invalid_vfs_overlay : Error<<br>
def warn_option_invalid_ocl_version : Warning<<br>
"OpenCL version %0 does not support the option '%1'">, InGroup<Deprecated>;<br>
<br>
-def warn_stdlibcxx_not_found : Warning<<br>
- "include path for stdlibc++ headers not found; pass '-stdlib=libc++' on the "<br>
- "command line to use the libc++ standard library instead">,<br>
- InGroup<DiagGroup<"stdlibcxx-not-found">>;<br>
-<br>
def err_builtin_needs_feature : Error<"%0 needs target feature %1">;<br>
def err_function_needs_feature : Error<<br>
"always_inline function %1 requires target feature '%2', but would "<br>
<br>
Modified: cfe/trunk/lib/Driver/ToolChains/Darwin.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Darwin.cpp?rev=361278&r1=361277&r2=361278&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Darwin.cpp?rev=361278&r1=361277&r2=361278&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/ToolChains/Darwin.cpp (original)<br>
+++ cfe/trunk/lib/Driver/ToolChains/Darwin.cpp Tue May 21 10:48:04 2019<br>
@@ -11,6 +11,7 @@<br>
#include "CommonArgs.h"<br>
#include "clang/Basic/AlignedAllocation.h"<br>
#include "clang/Basic/ObjCRuntime.h"<br>
+#include "clang/Config/config.h"<br>
#include "clang/Driver/Compilation.h"<br>
#include "clang/Driver/Driver.h"<br>
#include "clang/Driver/DriverDiagnostic.h"<br>
@@ -1804,6 +1805,84 @@ void Darwin::AddDeploymentTarget(Derived<br>
}<br>
}<br>
<br>
+void DarwinClang::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,<br>
+ llvm::opt::ArgStringList &CC1Args) const {<br>
+ const Driver &D = getDriver();<br>
+<br>
+ llvm::StringRef Sysroot = "/";<br>
+ if (const Arg *A = DriverArgs.getLastArg(options::OPT_isysroot))<br>
+ Sysroot = A->getValue();<br>
+<br>
+ bool NoStdInc = DriverArgs.hasArg(options::OPT_nostdinc);<br>
+ bool NoStdlibInc = DriverArgs.hasArg(options::OPT_nostdlibinc);<br>
+ bool NoBuiltinInc = DriverArgs.hasArg(options::OPT_nobuiltininc);<br>
+<br>
+ // Add <sysroot>/usr/local/include<br>
+ if (!NoStdInc && !NoStdlibInc) {<br>
+ SmallString<128> P(Sysroot);<br>
+ llvm::sys::path::append(P, "usr", "local", "include");<br>
+ addSystemInclude(DriverArgs, CC1Args, P);<br>
+ }<br>
+<br>
+ // Add the Clang builtin headers (<resource>/include)<br>
+ if (!NoStdInc && !NoBuiltinInc) {<br>
+ SmallString<128> P(D.ResourceDir);<br>
+ llvm::sys::path::append(P, "include");<br>
+ addSystemInclude(DriverArgs, CC1Args, P);<br>
+ }<br>
+<br>
+ if (NoStdInc || NoStdlibInc)<br>
+ return;<br>
+<br>
+ // Check for configure-time C include directories.<br>
+ llvm::StringRef CIncludeDirs(C_INCLUDE_DIRS);<br>
+ if (!CIncludeDirs.empty()) {<br>
+ llvm::SmallVector<llvm::StringRef, 5> dirs;<br>
+ CIncludeDirs.split(dirs, ":");<br>
+ for (llvm::StringRef dir : dirs) {<br>
+ llvm::StringRef Prefix =<br>
+ llvm::sys::path::is_absolute(dir) ? llvm::StringRef(Sysroot) : "";<br>
+ addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir);<br>
+ }<br>
+ } else {<br>
+ // Otherwise, add <sysroot>/usr/include.<br>
+ SmallString<128> P(Sysroot);<br>
+ llvm::sys::path::append(P, "usr", "include");<br>
+ addExternCSystemInclude(DriverArgs, CC1Args, P.str());<br>
+ }<br>
+}<br>
+<br>
+bool DarwinClang::AddGnuCPlusPlusIncludePaths(const llvm::opt::ArgList &DriverArgs,<br>
+ llvm::opt::ArgStringList &CC1Args,<br>
+ llvm::SmallString<128> Base,<br>
+ llvm::StringRef Version,<br>
+ llvm::StringRef ArchDir,<br>
+ llvm::StringRef BitDir) const {<br>
+ llvm::sys::path::append(Base, Version);<br>
+<br>
+ // Add the base dir<br>
+ addSystemInclude(DriverArgs, CC1Args, Base);<br>
+<br>
+ // Add the multilib dirs<br>
+ {<br>
+ llvm::SmallString<128> P = Base;<br>
+ if (!ArchDir.empty())<br>
+ llvm::sys::path::append(P, ArchDir);<br>
+ if (!BitDir.empty())<br>
+ llvm::sys::path::append(P, BitDir);<br>
+ addSystemInclude(DriverArgs, CC1Args, P);<br>
+ }<br>
+<br>
+ // Add the backward dir<br>
+ {<br>
+ llvm::SmallString<128> P = Base;<br>
+ llvm::sys::path::append(P, "backward");<br>
+ addSystemInclude(DriverArgs, CC1Args, P);<br>
+ }<br>
+<br>
+ return getVFS().exists(Base);<br>
+}<br>
+<br>
void DarwinClang::AddClangCXXStdlibIncludeArgs(<br>
const llvm::opt::ArgList &DriverArgs,<br>
llvm::opt::ArgStringList &CC1Args) const {<br>
@@ -1811,29 +1890,95 @@ void DarwinClang::AddClangCXXStdlibInclu<br>
// CC1Args.<br>
// FIXME: this should not be necessary, remove usages in the frontend<br>
// (e.g. HeaderSearchOptions::UseLibcxx) and don't pipe -stdlib.<br>
+ // Also check whether this is used for setting library search paths.<br>
ToolChain::AddClangCXXStdlibIncludeArgs(DriverArgs, CC1Args);<br>
<br>
if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||<br>
DriverArgs.hasArg(options::OPT_nostdincxx))<br>
return;<br>
<br>
+ llvm::SmallString<128> Sysroot;<br>
+ if (const Arg *A = DriverArgs.getLastArg(options::OPT_isysroot)) {<br>
+ Sysroot = A->getValue();<br>
+ } else {<br>
+ Sysroot = "/";<br>
+ }<br>
+<br>
switch (GetCXXStdlibType(DriverArgs)) {<br>
case ToolChain::CST_Libcxx: {<br>
- llvm::StringRef InstallDir = getDriver().getInstalledDir();<br>
- if (InstallDir.empty())<br>
- break;<br>
- // On Darwin, libc++ may be installed alongside the compiler in<br>
- // include/c++/v1.<br>
- // Get from 'foo/bin' to 'foo/include/c++/v1'.<br>
- SmallString<128> P = InstallDir;<br>
- // Note that InstallDir can be relative, so we have to '..' and not<br>
- // parent_path.<br>
- llvm::sys::path::append(P, "..", "include", "c++", "v1");<br>
- addSystemInclude(DriverArgs, CC1Args, P);<br>
+ // On Darwin, libc++ is installed alongside the compiler in<br>
+ // include/c++/v1, so get from '<install>/bin' to '<install>/include/c++/v1'.<br>
+ {<br>
+ llvm::SmallString<128> P = llvm::StringRef(getDriver().getInstalledDir());<br>
+ // Note that P can be relative, so we have to '..' and not parent_path.<br>
+ llvm::sys::path::append(P, "..", "include", "c++", "v1");<br>
+ addSystemInclude(DriverArgs, CC1Args, P);<br>
+ }<br>
+ // Also add <sysroot>/usr/include/c++/v1 unless -nostdinc is used,<br>
+ // to match the legacy behavior in CC1.<br>
+ if (!DriverArgs.hasArg(options::OPT_nostdinc)) {<br>
+ llvm::SmallString<128> P = Sysroot;<br>
+ llvm::sys::path::append(P, "usr", "include", "c++", "v1");<br>
+ addSystemInclude(DriverArgs, CC1Args, P);<br>
+ }<br>
break;<br>
}<br>
+<br>
case ToolChain::CST_Libstdcxx:<br>
- // FIXME: should we do something about it?<br>
+ llvm::SmallString<128> UsrIncludeCxx = Sysroot;<br>
+ llvm::sys::path::append(UsrIncludeCxx, "usr", "include", "c++");<br>
+<br>
+ llvm::Triple::ArchType arch = getTriple().getArch();<br>
+ bool IsBaseFound = true;<br>
+ switch (arch) {<br>
+ default: break;<br>
+<br>
+ case llvm::Triple::ppc:<br>
+ case llvm::Triple::ppc64:<br>
+ IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,<br>
+ "4.2.1",<br>
+ "powerpc-apple-darwin10",<br>
+ arch == llvm::Triple::ppc64 ? "ppc64" : "");<br>
+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,<br>
+ "4.0.0", "powerpc-apple-darwin10",<br>
+ arch == llvm::Triple::ppc64 ? "ppc64" : "");<br>
+ break;<br>
+<br>
+ case llvm::Triple::x86:<br>
+ case llvm::Triple::x86_64:<br>
+ IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,<br>
+ "4.2.1",<br>
+ "i686-apple-darwin10",<br>
+ arch == llvm::Triple::x86_64 ? "x86_64" : "");<br>
+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,<br>
+ "4.0.0", "i686-apple-darwin8",<br>
+ "");<br>
+ break;<br>
+<br>
+ case llvm::Triple::arm:<br>
+ case llvm::Triple::thumb:<br>
+ IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,<br>
+ "4.2.1",<br>
+ "arm-apple-darwin10",<br>
+ "v7");<br>
+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,<br>
+ "4.2.1",<br>
+ "arm-apple-darwin10",<br>
+ "v6");<br>
+ break;<br>
+<br>
+ case llvm::Triple::aarch64:<br>
+ IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,<br>
+ "4.2.1",<br>
+ "arm64-apple-darwin10",<br>
+ "");<br>
+ break;<br>
+ }<br>
+<br>
+ if (!IsBaseFound) {<br>
+ getDriver().Diag(diag::warn_drv_libstdcxx_not_found);<br>
+ }<br>
+<br>
break;<br>
}<br>
}<br>
<br>
Modified: cfe/trunk/lib/Driver/ToolChains/Darwin.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Darwin.h?rev=361278&r1=361277&r2=361278&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Darwin.h?rev=361278&r1=361277&r2=361278&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/ToolChains/Darwin.h (original)<br>
+++ cfe/trunk/lib/Driver/ToolChains/Darwin.h Tue May 21 10:48:04 2019<br>
@@ -503,6 +503,9 @@ public:<br>
const llvm::opt::ArgList &DriverArgs,<br>
llvm::opt::ArgStringList &CC1Args) const override;<br>
<br>
+ void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,<br>
+ llvm::opt::ArgStringList &CC1Args) const override;<br>
+<br>
void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args,<br>
llvm::opt::ArgStringList &CmdArgs) const override;<br>
<br>
@@ -529,6 +532,13 @@ private:<br>
llvm::opt::ArgStringList &CmdArgs,<br>
StringRef Sanitizer,<br>
bool shared = true) const;<br>
+<br>
+ bool AddGnuCPlusPlusIncludePaths(const llvm::opt::ArgList &DriverArgs,<br>
+ llvm::opt::ArgStringList &CC1Args,<br>
+ llvm::SmallString<128> Base,<br>
+ llvm::StringRef Version,<br>
+ llvm::StringRef ArchDir,<br>
+ llvm::StringRef BitDir) const;<br>
};<br>
<br>
} // end namespace toolchains<br>
<br>
Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=361278&r1=361277&r2=361278&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=361278&r1=361277&r2=361278&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Tue May 21 10:48:04 2019<br>
@@ -210,6 +210,10 @@ void InitHeaderSearch::AddDefaultCInclud<br>
const HeaderSearchOptions &HSOpts) {<br>
llvm::Triple::OSType os = triple.getOS();<br>
<br>
+ if (triple.isOSDarwin()) {<br>
+ llvm_unreachable("Include management is handled in the driver.");<br>
+ }<br>
+<br>
if (HSOpts.UseStandardSystemIncludes) {<br>
switch (os) {<br>
case llvm::Triple::CloudABI:<br>
@@ -365,49 +369,7 @@ void InitHeaderSearch::AddDefaultCPlusPl<br>
// FIXME: temporary hack: hard-coded paths.<br>
<br>
if (triple.isOSDarwin()) {<br>
- bool IsBaseFound = true;<br>
- switch (triple.getArch()) {<br>
- default: break;<br>
-<br>
- case llvm::Triple::ppc:<br>
- case llvm::Triple::ppc64:<br>
- IsBaseFound = AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",<br>
- "powerpc-apple-darwin10", "",<br>
- "ppc64", triple);<br>
- IsBaseFound |= AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",<br>
- "powerpc-apple-darwin10", "",<br>
- "ppc64", triple);<br>
- break;<br>
-<br>
- case llvm::Triple::x86:<br>
- case llvm::Triple::x86_64:<br>
- IsBaseFound = AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",<br>
- "i686-apple-darwin10", "",<br>
- "x86_64", triple);<br>
- IsBaseFound |= AddGnuCPlusPlusIncludePaths(<br>
- "/usr/include/c++/4.0.0", "i686-apple-darwin8", "", "", triple);<br>
- break;<br>
-<br>
- case llvm::Triple::arm:<br>
- case llvm::Triple::thumb:<br>
- IsBaseFound = AddGnuCPlusPlusIncludePaths(<br>
- "/usr/include/c++/4.2.1", "arm-apple-darwin10", "v7", "", triple);<br>
- IsBaseFound |= AddGnuCPlusPlusIncludePaths(<br>
- "/usr/include/c++/4.2.1", "arm-apple-darwin10", "v6", "", triple);<br>
- break;<br>
-<br>
- case llvm::Triple::aarch64:<br>
- IsBaseFound = AddGnuCPlusPlusIncludePaths(<br>
- "/usr/include/c++/4.2.1", "arm64-apple-darwin10", "", "", triple);<br>
- break;<br>
- }<br>
- // Warn when compiling pure C++ / Objective-C++ only.<br>
- if (!IsBaseFound &&<br>
- !(LangOpts.CUDA || LangOpts.OpenCL || LangOpts.RenderScript)) {<br>
- Headers.getDiags().Report(SourceLocation(),<br>
- diag::warn_stdlibcxx_not_found);<br>
- }<br>
- return;<br>
+ llvm_unreachable("Include management is handled in the driver.");<br>
}<br>
<br>
switch (os) {<br>
@@ -464,6 +426,16 @@ void InitHeaderSearch::AddDefaultInclude<br>
break;<br>
}<br>
<br>
+ // All header search logic is handled in the Driver for Darwin.<br>
+ if (triple.isOSDarwin()) {<br>
+ if (HSOpts.UseStandardSystemIncludes) {<br>
+ // Add the default framework include paths on Darwin.<br>
+ AddPath("/System/Library/Frameworks", System, true);<br>
+ AddPath("/Library/Frameworks", System, true);<br>
+ }<br>
+ return;<br>
+ }<br>
+<br>
if (Lang.CPlusPlus && !Lang.AsmPreprocessor &&<br>
HSOpts.UseStandardCXXIncludes && HSOpts.UseStandardSystemIncludes) {<br>
if (HSOpts.UseLibcxx) {<br>
@@ -474,14 +446,6 @@ void InitHeaderSearch::AddDefaultInclude<br>
}<br>
<br>
AddDefaultCIncludePaths(triple, HSOpts);<br>
-<br>
- // Add the default framework include paths on Darwin.<br>
- if (HSOpts.UseStandardSystemIncludes) {<br>
- if (triple.isOSDarwin()) {<br>
- AddPath("/System/Library/Frameworks", System, true);<br>
- AddPath("/Library/Frameworks", System, true);<br>
- }<br>
- }<br>
}<br>
<br>
/// RemoveDuplicates - If there are duplicate directory entries in the specified<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/c++/4.2.1/arm64-apple-darwin10/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/c%2B%2B/4.2.1/arm64-apple-darwin10/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/include/c%2B%2B/4.2.1/arm64-apple-darwin10/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_aarch64/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/arm-apple-darwin10/v6/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c%2B%2B/4.2.1/arm-apple-darwin10/v6/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c%2B%2B/4.2.1/arm-apple-darwin10/v6/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c++/4.2.1/arm-apple-darwin10/v7/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c%2B%2B/4.2.1/arm-apple-darwin10/v7/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/include/c%2B%2B/4.2.1/arm-apple-darwin10/v7/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_arm/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.0.0/powerpc-apple-darwin10/ppc64/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c%2B%2B/4.0.0/powerpc-apple-darwin10/ppc64/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c%2B%2B/4.0.0/powerpc-apple-darwin10/ppc64/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c++/4.2.1/powerpc-apple-darwin10/ppc64/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c%2B%2B/4.2.1/powerpc-apple-darwin10/ppc64/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/include/c%2B%2B/4.2.1/powerpc-apple-darwin10/ppc64/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_ppc/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.0.0/i686-apple-darwin8/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c%2B%2B/4.0.0/i686-apple-darwin8/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c%2B%2B/4.0.0/i686-apple-darwin8/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c++/4.2.1/i686-apple-darwin10/x86_64/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c%2B%2B/4.2.1/i686-apple-darwin10/x86_64/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/include/c%2B%2B/4.2.1/i686-apple-darwin10/x86_64/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_libstdcxx_x86/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/include/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/include/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/include/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libcxx/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/include/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/include/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/include/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_no_libstdcxx/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/include/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/include/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/include/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/include/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/include/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/include/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/include/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/include/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/include/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_and_usr_local/usr/local/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/include/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/include/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/include/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/lib/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/lib/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_sdk_usr_local/usr/local/lib/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/bin/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/bin/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/bin/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/include/c++/v1/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/include/c%2B%2B/v1/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain/usr/include/c%2B%2B/v1/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin/.keep<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin/.keep?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin/.keep?rev=361278&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/darwin-header-search-libcxx.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-header-search-libcxx.cpp?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-header-search-libcxx.cpp?rev=361278&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/darwin-header-search-libcxx.cpp (added)<br>
+++ cfe/trunk/test/Driver/darwin-header-search-libcxx.cpp Tue May 21 10:48:04 2019<br>
@@ -0,0 +1,78 @@<br>
+// General tests that the header search paths for libc++ detected by the driver<br>
+// and passed to CC1 are correct on Darwin platforms.<br>
+<br>
+// Check without a sysroot and without headers alongside the installation<br>
+// (no include path should be added, and no warning or error).<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -stdlib=libc++ \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \<br>
+// RUN: | FileCheck --check-prefix=CHECK-LIBCXX-NONE %s<br>
+// CHECK-LIBCXX-NONE: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+<br>
+// Check with only headers alongside the installation (those should be used,<br>
+// but we should still add /usr/include/c++/v1 after to preserve legacy).<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -stdlib=libc++ \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \<br>
+// RUN: | FileCheck -DTOOLCHAIN=%S/Inputs/basic_darwin_toolchain --check-prefix=CHECK-LIBCXX-TOOLCHAIN-1 %s<br>
+// CHECK-LIBCXX-TOOLCHAIN-1: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBCXX-TOOLCHAIN-1: "-internal-isystem" "[[TOOLCHAIN]]/usr/bin/../include/c++/v1"<br>
+// CHECK-LIBCXX-TOOLCHAIN-1: "-internal-isystem" "/usr/include/c++/v1"<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -stdlib=libc++ \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_no_libcxx \<br>
+// RUN: | FileCheck -DTOOLCHAIN=%S/Inputs/basic_darwin_toolchain --check-prefix=CHECK-LIBCXX-TOOLCHAIN-2 %s<br>
+// CHECK-LIBCXX-TOOLCHAIN-2: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBCXX-TOOLCHAIN-2: "-internal-isystem" "[[TOOLCHAIN]]/usr/bin/../include/c++/v1"<br>
+<br>
+// Check with both headers in the sysroot and headers alongside the installation<br>
+// (the headers in <sysroot> should be added after the toolchain headers).<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -stdlib=libc++ \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr \<br>
+// RUN: -DTOOLCHAIN=%S/Inputs/basic_darwin_toolchain \<br>
+// RUN: --check-prefix=CHECK-LIBCXX-SYSROOT_AND_TOOLCHAIN-1 %s<br>
+// CHECK-LIBCXX-SYSROOT_AND_TOOLCHAIN-1: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBCXX-SYSROOT_AND_TOOLCHAIN-1: "-internal-isystem" "[[TOOLCHAIN]]/usr/bin/../include/c++/v1"<br>
+// CHECK-LIBCXX-SYSROOT_AND_TOOLCHAIN-1: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1"<br>
+<br>
+// Make sure that using -nostdinc or -nostdlibinc will drop the non-toolchain<br>
+// C++ library include paths (so all except <toolchain>/usr/bin/../include/c++/v1).<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr \<br>
+// RUN: -nostdinc \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr \<br>
+// RUN: -DTOOLCHAIN=%S/Inputs/basic_darwin_toolchain \<br>
+// RUN: --check-prefix=CHECK-LIBCXX-NOSTDINC %s<br>
+// CHECK-LIBCXX-NOSTDINC: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBCXX-NOSTDINC: "-internal-isystem" "[[TOOLCHAIN]]/usr/bin/../include/c++/v1"<br>
+// CHECK-LIBCXX-NOSTDINC-NOT: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1"<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr \<br>
+// RUN: -nostdinc \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr \<br>
+// RUN: -DTOOLCHAIN=%S/Inputs/basic_darwin_toolchain \<br>
+// RUN: --check-prefix=CHECK-LIBCXX-NOSTDLIBINC %s<br>
+// CHECK-LIBCXX-NOSTDLIBINC: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBCXX-NOSTDLIBINC: "-internal-isystem" "[[TOOLCHAIN]]/usr/bin/../include/c++/v1"<br>
+// CHECK-LIBCXX-NOSTDLIBINC-NOT: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1"<br>
<br>
Added: cfe/trunk/test/Driver/darwin-header-search-libstdcxx.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-header-search-libstdcxx.cpp?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-header-search-libstdcxx.cpp?rev=361278&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/darwin-header-search-libstdcxx.cpp (added)<br>
+++ cfe/trunk/test/Driver/darwin-header-search-libstdcxx.cpp Tue May 21 10:48:04 2019<br>
@@ -0,0 +1,118 @@<br>
+// General tests that the header search paths for libstdc++ detected by the<br>
+// driver and passed to CC1 are correct on Darwin platforms.<br>
+<br>
+// Check ppc and ppc64<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target ppc-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_libstdcxx_ppc \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_libstdcxx_ppc --check-prefix=CHECK-LIBSTDCXX-PPC %s<br>
+// CHECK-LIBSTDCXX-PPC: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBSTDCXX-PPC: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1<br>
+// CHECK-LIBSTDCXX-PPC: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/powerpc-apple-darwin10"<br>
+// CHECK-LIBSTDCXX-PPC: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+// CHECK-LIBSTDCXX-PPC: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0"<br>
+// CHECK-LIBSTDCXX-PPC: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/powerpc-apple-darwin10"<br>
+// CHECK-LIBSTDCXX-PPC: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/backward"<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target ppc64-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_libstdcxx_ppc \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_libstdcxx_ppc --check-prefix=CHECK-LIBSTDCXX-PPC64 %s<br>
+// CHECK-LIBSTDCXX-PPC64: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBSTDCXX-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/powerpc-apple-darwin10/ppc64"<br>
+// CHECK-LIBSTDCXX-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+// CHECK-LIBSTDCXX-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0"<br>
+// CHECK-LIBSTDCXX-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/powerpc-apple-darwin10/ppc64"<br>
+// CHECK-LIBSTDCXX-PPC64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/backward"<br>
+<br>
+// Check x86 and x86_64<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target i686-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_libstdcxx_x86 \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_libstdcxx_x86 --check-prefix=CHECK-LIBSTDCXX-X86 %s<br>
+// CHECK-LIBSTDCXX-X86: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBSTDCXX-X86: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-X86: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/i686-apple-darwin10"<br>
+// CHECK-LIBSTDCXX-X86: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+// CHECK-LIBSTDCXX-X86: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0"<br>
+// CHECK-LIBSTDCXX-X86: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/i686-apple-darwin8"<br>
+// CHECK-LIBSTDCXX-X86: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/backward"<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_libstdcxx_x86 \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_libstdcxx_x86 --check-prefix=CHECK-LIBSTDCXX-X86_64 %s<br>
+// CHECK-LIBSTDCXX-X86_64: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBSTDCXX-X86_64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-X86_64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/i686-apple-darwin10/x86_64"<br>
+// CHECK-LIBSTDCXX-X86_64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+// CHECK-LIBSTDCXX-X86_64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0"<br>
+// CHECK-LIBSTDCXX-X86_64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/i686-apple-darwin8"<br>
+// CHECK-LIBSTDCXX-X86_64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.0.0/backward"<br>
+<br>
+// Check arm and thumb<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target arm-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_libstdcxx_arm \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_libstdcxx_arm --check-prefix=CHECK-LIBSTDCXX-ARM %s<br>
+// CHECK-LIBSTDCXX-ARM: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBSTDCXX-ARM: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-ARM: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/arm-apple-darwin10/v7"<br>
+// CHECK-LIBSTDCXX-ARM: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+// CHECK-LIBSTDCXX-ARM: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-ARM: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/arm-apple-darwin10/v6"<br>
+// CHECK-LIBSTDCXX-ARM: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target arm-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_libstdcxx_arm \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_libstdcxx_arm --check-prefix=CHECK-LIBSTDCXX-THUMB %s<br>
+// CHECK-LIBSTDCXX-THUMB: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBSTDCXX-THUMB: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-THUMB: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/arm-apple-darwin10/v7"<br>
+// CHECK-LIBSTDCXX-THUMB: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+// CHECK-LIBSTDCXX-THUMB: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-THUMB: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/arm-apple-darwin10/v6"<br>
+// CHECK-LIBSTDCXX-THUMB: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+<br>
+// Check aarch64<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target arm64-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_libstdcxx_aarch64 \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_libstdcxx_aarch64 --check-prefix=CHECK-LIBSTDCXX-AARCH64 %s<br>
+// CHECK-LIBSTDCXX-AARCH64: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-LIBSTDCXX-AARCH64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1"<br>
+// CHECK-LIBSTDCXX-AARCH64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/arm64-apple-darwin10"<br>
+// CHECK-LIBSTDCXX-AARCH64: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/4.2.1/backward"<br>
+<br>
+// Make sure we issue a warning when we can't find the path<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -stdlib=libstdc++ \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_no_libstdcxx \<br>
+// RUN: | FileCheck --check-prefix=CHECK-LIBSTDCXX-MISSING %s<br>
+// CHECK-LIBSTDCXX-MISSING: clang: warning: include path for libstdc++ headers not found; pass '-stdlib=libc++' on the command line to use the libc++ standard library instead<br>
+//<br>
+// RUN: %clang %s -target x86_64-apple-darwin -fsyntax-only 2>&1 \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_no_libstdcxx \<br>
+// RUN: -stdlib=libc++ \<br>
+// RUN: | FileCheck -allow-empty --check-prefix=CHECK-LIBSTDCXX-MISSING-1 %s<br>
+// CHECK-LIBSTDCXX-MISSING-1-NOT: warning<br>
+//<br>
+// RUN: %clang %s -target x86_64-apple-darwin -fsyntax-only 2>&1 \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_no_libstdcxx \<br>
+// RUN: | FileCheck -allow-empty --check-prefix=CHECK-LIBSTDCXX-MISSING-2 %s<br>
+// CHECK-LIBSTDCXX-MISSING-2-NOT: warning<br>
<br>
Added: cfe/trunk/test/Driver/darwin-header-search-system.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-header-search-system.cpp?rev=361278&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-header-search-system.cpp?rev=361278&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/darwin-header-search-system.cpp (added)<br>
+++ cfe/trunk/test/Driver/darwin-header-search-system.cpp Tue May 21 10:48:04 2019<br>
@@ -0,0 +1,80 @@<br>
+// General tests that the system header search paths detected by the driver<br>
+// and passed to CC1 are correct on Darwin platforms.<br>
+<br>
+// Check system headers (everything below <sysroot> and <resource-dir>)<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: -DRESOURCE=%S/Inputs/resource_dir \<br>
+// RUN: --check-prefix=CHECK-SYSTEM %s<br>
+// CHECK-SYSTEM: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-SYSTEM: "-internal-isystem" "[[SYSROOT]]/usr/local/include"<br>
+// CHECK-SYSTEM: "-internal-isystem" "[[RESOURCE]]/include"<br>
+// CHECK-SYSTEM: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"<br>
+<br>
+// Make sure that using -nobuiltininc will drop resource headers<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: -nobuiltininc \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: -DRESOURCE=%S/Inputs/resource_dir \<br>
+// RUN: --check-prefix=CHECK-NOBUILTININC %s<br>
+// CHECK-NOBUILTININC: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-NOBUILTININC: "-internal-isystem" "[[SYSROOT]]/usr/local/include"<br>
+// CHECK-NOBUILTININC-NOT: "-internal-isystem" "[[RESOURCE]]/include"<br>
+// CHECK-NOBUILTININC: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"<br>
+<br>
+// Make sure that using -nostdlibinc will drop <sysroot>/usr/local/include and<br>
+// <sysroot>/usr/include.<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: -nostdlibinc \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: -DRESOURCE=%S/Inputs/resource_dir \<br>
+// RUN: --check-prefix=CHECK-NOSTDLIBINC %s<br>
+// CHECK-NOSTDLIBINC: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-NOSTDLIBINC-NOT: "-internal-isystem" "[[SYSROOT]]/usr/local/include"<br>
+// CHECK-NOSTDLIBINC: "-internal-isystem" "[[RESOURCE]]/include"<br>
+// CHECK-NOSTDLIBINC-NOT: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"<br>
+<br>
+// Make sure that -nostdinc drops all the system include paths, including<br>
+// <resource>/include.<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: -isysroot %S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: -nostdinc \<br>
+// RUN: | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr_and_usr_local \<br>
+// RUN: -DRESOURCE=%S/Inputs/resource_dir \<br>
+// RUN: --check-prefix=CHECK-NOSTDINC %s<br>
+// CHECK-NOSTDINC: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-NOSTDINC-NOT: "-internal-isystem" "[[SYSROOT]]/usr/local/include"<br>
+// CHECK-NOSTDINC-NOT: "-internal-isystem" "[[RESOURCE]]/include"<br>
+// CHECK-NOSTDINC-NOT: "-internal-externc-isystem" "[[SYSROOT]]/usr/include"<br>
+<br>
+// Check search paths without -isysroot<br>
+//<br>
+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \<br>
+// RUN: -target x86_64-apple-darwin \<br>
+// RUN: -ccc-install-dir %S/Inputs/basic_darwin_toolchain_no_libcxx/usr/bin \<br>
+// RUN: -resource-dir=%S/Inputs/resource_dir \<br>
+// RUN: | FileCheck -DRESOURCE=%S/Inputs/resource_dir \<br>
+// RUN: --check-prefix=CHECK-NOSYSROOT %s<br>
+// CHECK-NOSYSROOT: "{{[^"]*}}clang{{[^"]*}}" "-cc1"<br>
+// CHECK-NOSYSROOT: "-internal-isystem" "/usr/local/include"<br>
+// CHECK-NOSYSROOT: "-internal-isystem" "[[RESOURCE]]/include"<br>
+// CHECK-NOSYSROOT: "-internal-externc-isystem" "/usr/include"<br>
<br>
Modified: cfe/trunk/test/Driver/darwin-stdlib.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-stdlib.cpp?rev=361278&r1=361277&r2=361278&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-stdlib.cpp?rev=361278&r1=361277&r2=361278&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/darwin-stdlib.cpp (original)<br>
+++ cfe/trunk/test/Driver/darwin-stdlib.cpp Tue May 21 10:48:04 2019<br>
@@ -3,19 +3,12 @@<br>
// XFAIL: default-cxx-stdlib-set<br>
<br>
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -arch arm64 -miphoneos-version-min=7.0 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBCXX<br>
-// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -mmacosx-version-min=10.8 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBSTDCXX<br>
+// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -mmacosx-version-min=10.8 -Wno-stdlibcxx-not-found %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBSTDCXX<br>
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -mmacosx-version-min=10.9 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBCXX<br>
-// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -arch armv7s -miphoneos-version-min=6.1 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBSTDCXX<br>
+// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -arch armv7s -miphoneos-version-min=6.1 -Wno-stdlibcxx-not-found %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBSTDCXX<br>
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -arch armv7s -miphoneos-version-min=7.0 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBCXX<br>
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %S/Inputs/darwin_toolchain_tree/bin/ -arch armv7k %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBCXX<br>
<br>
-// The purpose of this test is that the libc++ headers should be found<br>
-// properly. We also pass -stdlib=libc++ to make sure the logic to add the<br>
-// optional absolute include for libc++ from InitHeaderSearch.cpp also fires.<br>
-<br>
// CHECK-LIBCXX: "-stdlib=libc++"<br>
-// CHECK-LIBCXX: "-internal-isystem" "{{[^"]*}}{{/|\\\\}}Inputs{{/|\\\\}}darwin_toolchain_tree{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"<br>
-<br>
// CHECK-LIBSTDCXX-NOT: -stdlib=libc++<br>
// CHECK-LIBSTDCXX-NOT: -stdlib=libstdc++<br>
-// CHECK-LIBSTDCXX-NOT: -internal-isystem<br>
<br>
Removed: cfe/trunk/test/Frontend/warning-stdlibcxx-darwin.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/warning-stdlibcxx-darwin.cpp?rev=361277&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/warning-stdlibcxx-darwin.cpp?rev=361277&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Frontend/warning-stdlibcxx-darwin.cpp (original)<br>
+++ cfe/trunk/test/Frontend/warning-stdlibcxx-darwin.cpp (removed)<br>
@@ -1,6 +0,0 @@<br>
-// RUN: %clang -cc1 -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist %s 2>&1 | FileCheck %s<br>
-// RUN: %clang -cc1 -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist -stdlib=libc++ %s -verify<br>
-// RUN: %clang -cc1 -x c++-cpp-output -triple arm64-apple-ios6.0.0 -isysroot %S/doesnotexist %s -verify<br>
-// CHECK: include path for stdlibc++ headers not found; pass '-stdlib=libc++' on the command line to use the libc++ standard library instead<br>
-<br>
-// expected-no-diagnostics<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div>
</div></blockquote></div><br></div></div></div>_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div>