<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Aug 18, 2015 at 3:00 PM, Hans Wennborg via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Richard, I tried to ping you on the review thread but I'm not sure it<br>
got through. Martell requested this be merged to 3.7. What do you<br>
think?</blockquote><div><br></div><div>Sure, this looks fine for branch.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">
On Thu, Aug 13, 2015 at 8:41 AM, Martell Malone via cfe-commits<br>
<<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
> Author: martell<br>
> Date: Thu Aug 13 10:41:04 2015<br>
> New Revision: 244902<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=244902&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=244902&view=rev</a><br>
> Log:<br>
> Driver: Fix include directories when not using libgcc under mingw<br>
><br>
> Summary:<br>
> When we want to use mingw-w64 and clang with compiler-rt we should not<br>
> need to have libgcc installed. This fixes finding includes when libgcc<br>
> is not installed<br>
><br>
> Reviewers: yaron.keren<br>
><br>
> Subscribers: cfe-commits<br>
><br>
> Differential Revision: <a href="http://reviews.llvm.org/D11808" rel="noreferrer" target="_blank">http://reviews.llvm.org/D11808</a><br>
><br>
> Added:<br>
>     cfe/trunk/test/Driver/Inputs/mingw_clang_tree/<br>
>     cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/<br>
>     cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/<br>
>     cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/include/<br>
>     cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/include/.keep<br>
>     cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/include/<br>
>     cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/include/.keep<br>
> Modified:<br>
>     cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
>     cfe/trunk/test/Driver/mingw.cpp<br>
><br>
> Modified: cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MinGWToolChain.cpp?rev=244902&r1=244901&r2=244902&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MinGWToolChain.cpp?rev=244902&r1=244901&r2=244902&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Driver/MinGWToolChain.cpp (original)<br>
> +++ cfe/trunk/lib/Driver/MinGWToolChain.cpp Thu Aug 13 10:41:04 2015<br>
> @@ -47,7 +47,7 @@ void MinGW::findGccLibDir() {<br>
>    Archs.emplace_back(getTriple().getArchName());<br>
>    Archs[0] += "-w64-mingw32";<br>
>    Archs.emplace_back("mingw32");<br>
> -  Arch = "unknown";<br>
> +  Arch = Archs[0].str();<br>
>    // lib: Arch Linux, Ubuntu, Windows<br>
>    // lib64: openSUSE Linux<br>
>    for (StringRef CandidateLib : {"lib", "lib64"}) {<br>
><br>
> Added: cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/include/.keep<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/include/.keep?rev=244902&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/i686-w64-mingw32/include/.keep?rev=244902&view=auto</a><br>
> ==============================================================================<br>
>     (empty)<br>
><br>
> Added: cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/include/.keep<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/include/.keep?rev=244902&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_clang_tree/mingw32/include/.keep?rev=244902&view=auto</a><br>
> ==============================================================================<br>
>     (empty)<br>
><br>
> Modified: cfe/trunk/test/Driver/mingw.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw.cpp?rev=244902&r1=244901&r2=244902&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw.cpp?rev=244902&r1=244901&r2=244902&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/Driver/mingw.cpp (original)<br>
> +++ cfe/trunk/test/Driver/mingw.cpp Thu Aug 13 10:41:04 2015<br>
> @@ -1,3 +1,8 @@<br>
> +// RUN: %clang -target i686-windows-gnu -c -### --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_CLANG_TREE %s<br>
> +// CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"<br>
> +// CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}include"<br>
> +<br>
> +<br>
>  // RUN: %clang -target i686-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_mingw_org_tree/mingw %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ORG_TREE %s<br>
>  // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++"<br>
>  // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32"<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div></div>