<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Jul 24, 2015 at 1:50 AM, Yaron Keren <span dir="ltr"><<a href="mailto:yaron.keren@gmail.com" target="_blank">yaron.keren@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: yrnkrn<br>
Date: Fri Jul 24 03:50:15 2015<br>
New Revision: 243098<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D243098-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=H5utZQ5f57Q--VUIKfvouSYHbPZcs-3jnaJo8QrT-YY&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=243098&view=rev</a><br>
Log:<br>
Add extensive tests for the mingw toolchain and remove trailing slash from Arch.<br>
<br>
Address Richard Smith comments: remove the trailing seperator from the Arch<br>
variable, implement six mingw_* trees under tools/clangtest/Driver/Inputs<br>
and merge linux and Windows tests into a universal test that uses these trees.<br>
<br>
<br>
Added:<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/backward/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/backward/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/i686-w64-mingw32/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/backward/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/backward/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/mingw32/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/backward/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/backward/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/i686-w64-mingw32/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/86_64-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/86_64-w64-mingw32/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/backward/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/backward/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/.keep<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/<br>
cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/.keep<br>
cfe/trunk/test/Driver/mingw.cpp<br>
Removed:<br>
cfe/trunk/test/Driver/mingw-linux.cpp<br>
cfe/trunk/test/Driver/mingw-win.cpp<br>
Modified:<br>
cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
<br>
Modified: cfe/trunk/lib/Driver/MinGWToolChain.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_lib_Driver_MinGWToolChain.cpp-3Frev-3D243098-26r1-3D243097-26r2-3D243098-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=fTvUQZusayXFHPIWZb-zmxKdzGPm_VNmVBNgV1k_39w&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MinGWToolChain.cpp?rev=243098&r1=243097&r2=243098&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/MinGWToolChain.cpp (original)<br>
+++ cfe/trunk/lib/Driver/MinGWToolChain.cpp Fri Jul 24 03:50:15 2015<br>
@@ -40,7 +40,7 @@ void MinGW::findGccLibDir() {<br>
if (!EC) {<br>
GccLibDir = MingwOrgEntry->path();<br>
// Replace Arch with mingw32 arch.<br>
- Arch = "mingw32//";<br>
+ Arch = "mingw32";<br>
break;<br>
}<br>
}<br>
@@ -51,8 +51,7 @@ MinGW::MinGW(const Driver &D, const llvm<br>
getProgramPaths().push_back(getDriver().getInstalledDir());<br>
<br>
// Default Arch is mingw-w64.<br>
- Arch = (getTriple().getArchName() + "-w64-mingw32" +<br>
- llvm::sys::path::get_separator()).str();<br>
+ Arch = (getTriple().getArchName() + "-w64-mingw32").str();<br>
<br>
// In Windows there aren't any standard install locations, we search<br>
// for gcc on the PATH. In Linux the base is always /usr.<br>
@@ -66,25 +65,23 @@ MinGW::MinGW(const Driver &D, const llvm<br>
else<br>
Base = llvm::sys::path::parent_path(getDriver().getInstalledDir());<br>
#else<br>
- Base = "/usr";<br>
+ if (getDriver().SysRoot.size())<br>
+ Base = getDriver().SysRoot;<br>
+ else<br>
+ Base = "/usr";<br>
#endif<br>
<br>
Base += llvm::sys::path::get_separator();<br>
- if (getDriver().SysRoot.size())<br>
- GccLibDir = getDriver().SysRoot;<br>
- else<br>
- findGccLibDir();<br>
+ findGccLibDir();<br>
Ver = llvm::sys::path::filename(GccLibDir);<br>
// GccLibDir must precede Base/lib so that the<br>
// correct crtbegin.o ,cetend.o would be found.<br>
getFilePaths().push_back(GccLibDir);<br>
- getFilePaths().push_back(Base + Arch + "lib");<br>
-#ifdef LLVM_ON_WIN32<br>
+ getFilePaths().push_back(<br>
+ (Base + Arch + llvm::sys::path::get_separator() + "lib").str());<br>
getFilePaths().push_back(Base + "lib");<br>
-#else<br>
// openSUSE<br>
- getFilePaths().push_back(Base + Arch + "sys-root/mingw/lib");<br>
-#endif<br>
+ getFilePaths().push_back(Base + Arch + "/sys-root/mingw/lib");<br></blockquote><div><br></div><div>You now appear to be unconditionally adding this path with Unix directory separators, even when on Windows. That doesn't look right to me; is that what you meant?</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
}<br>
<br>
bool MinGW::IsIntegratedAssemblerDefault() const { return true; }<br>
@@ -129,29 +126,29 @@ bool MinGW::UseSEHExceptions() const {<br>
// Include directories for various hosts:<br>
<br>
// Windows, <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__mingw.org&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=Vj6lE8owE58vjzKAlgHB5tiqRUMsJj_p6EM9nx1x19g&e=" rel="noreferrer" target="_blank">mingw.org</a><br>
-// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++<br>
-// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\mingw32<br>
-// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\backward<br>
-// c:\mingw\lib\gcc\mingw32\4.8.1\include<br>
-// c:\mingw\include<br>
-// c:\mingw\lib\gcc\mingw32\4.8.1\include-fixed<br>
+// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++<br>
+// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\mingw32<br>
+// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\backward<br>
+// c:\mingw\lib\gcc\mingw32\4.8.1\include<br>
+// c:\mingw\include<br>
+// c:\mingw\lib\gcc\mingw32\4.8.1\include-fixed<br>
// c:\mingw\mingw32\include<br>
<br>
// Windows, mingw-w64 mingw-builds<br>
-// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include<br>
-// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include-fixed<br>
-// c:\mingw32\i686-w64-mingw32\include<br>
-// c:\mingw32\i686-w64-mingw32\include\c++<br>
-// c:\mingw32\i686-w64-mingw32\include\c++\i686-w64-mingw32<br>
-// c:\mingw32\i686-w64-mingw32\include\c++\backward<br>
+// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include<br>
+// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include-fixed<br>
+// c:\mingw32\i686-w64-mingw32\include<br>
+// c:\mingw32\i686-w64-mingw32\include\c++<br>
+// c:\mingw32\i686-w64-mingw32\include\c++\i686-w64-mingw32<br>
+// c:\mingw32\i686-w64-mingw32\include\c++\backward<br>
<br>
// Windows, mingw-w64 msys2<br>
-// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include<br>
-// c:\msys64\mingw32\include<br>
-// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include-fixed<br>
-// c:\msys64\mingw32\i686-w64-mingw32\include<br>
-// c:\msys64\mingw32\include\c++\4.9.2<br>
-// c:\msys64\mingw32\include\c++\4.9.2\i686-w64-mingw32<br>
+// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include<br>
+// c:\msys64\mingw32\include<br>
+// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include-fixed<br>
+// c:\msys64\mingw32\i686-w64-mingw32\include<br>
+// c:\msys64\mingw32\include\c++\4.9.2<br>
+// c:\msys64\mingw32\include\c++\4.9.2\i686-w64-mingw32<br>
// c:\msys64\mingw32\include\c++\4.9.2\backward<br>
<br>
// openSUSE<br>
@@ -163,20 +160,20 @@ bool MinGW::UseSEHExceptions() const {<br>
// /usr/x86_64-w64-mingw32/sys-root/mingw/include<br>
<br>
// Arch Linux<br>
-// /usr/i686-w64-mingw32/include/c++/5.1.0<br>
-// /usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32<br>
-// /usr/i686-w64-mingw32/include/c++/5.1.0/backward<br>
-// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include<br>
-// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed<br>
+// /usr/i686-w64-mingw32/include/c++/5.1.0<br>
+// /usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32<br>
+// /usr/i686-w64-mingw32/include/c++/5.1.0/backward<br>
+// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include<br>
+// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed<br>
// /usr/i686-w64-mingw32/include<br>
<br>
// Ubuntu<br>
-// /usr/include/c++/4.8<br>
-// /usr/include/c++/4.8/x86_64-w64-mingw32<br>
-// /usr/include/c++/4.8/backward<br>
-// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include<br>
-// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed<br>
-// /usr/x86_64-w64-mingw32/include<br>
+// /usr/include/c++/4.8<br>
+// /usr/include/c++/4.8/x86_64-w64-mingw32<br>
+// /usr/include/c++/4.8/backward<br>
+// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include<br>
+// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed<br>
+// /usr/x86_64-w64-mingw32/include<br>
<br>
void MinGW::AddClangSystemIncludeArgs(const ArgList &DriverArgs,<br>
ArgStringList &CC1Args) const {<br>
@@ -197,14 +194,13 @@ void MinGW::AddClangSystemIncludeArgs(co<br>
llvm::sys::path::append(IncludeDir, "include");<br>
addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());<br>
IncludeDir += "-fixed";<br>
-#ifdef LLVM_ON_UNIX<br>
// openSUSE<br>
addSystemInclude(DriverArgs, CC1Args,<br>
"/usr/x86_64-w64-mingw32/sys-root/mingw/include");<br></blockquote><div><br></div><div>Likewise here. Plus, shouldn't this path be affected by the sysroot, and by the architecture?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
-#endif<br>
addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());<br>
}<br>
- addSystemInclude(DriverArgs, CC1Args, Base + Arch + "include");<br>
+ addSystemInclude(DriverArgs, CC1Args,<br>
+ Base + Arch + llvm::sys::path::get_separator() + "include");<br>
addSystemInclude(DriverArgs, CC1Args, Base + "include");<br>
}<br>
<br>
@@ -216,9 +212,9 @@ void MinGW::AddClangCXXStdlibIncludeArgs<br>
<br>
switch (GetCXXStdlibType(DriverArgs)) {<br>
case ToolChain::CST_Libcxx:<br>
- addSystemInclude(DriverArgs, CC1Args, Base + "include" +<br>
- llvm::sys::path::get_separator() + "c++" +<br>
- llvm::sys::path::get_separator() + "v1");<br>
+ addSystemInclude(DriverArgs, CC1Args,<br>
+ Base + "include" + llvm::sys::path::get_separator() +<br>
+ "c++" + llvm::sys::path::get_separator() + "v1");<br>
break;<br>
<br>
case ToolChain::CST_Libstdcxx:<br>
@@ -232,8 +228,8 @@ void MinGW::AddClangCXXStdlibIncludeArgs<br>
CppIncludeBases.emplace_back(GccLibDir);<br>
llvm::sys::path::append(CppIncludeBases[3], "include", "c++");<br>
for (auto &CppIncludeBase : CppIncludeBases) {<br>
- CppIncludeBase += llvm::sys::path::get_separator();<br>
addSystemInclude(DriverArgs, CC1Args, CppIncludeBase);<br>
+ CppIncludeBase += llvm::sys::path::get_separator();<br>
addSystemInclude(DriverArgs, CC1Args, CppIncludeBase + Arch);<br>
addSystemInclude(DriverArgs, CC1Args, CppIncludeBase + "backward");<br>
}<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Farch-5Ftree_usr_i686-2Dw64-2Dmingw32_include_c-252B-252B_5.1.0_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=Zn8hCQhhdtvXzidU-HIPvMflBKsoVwmSRBOFQ7jvxko&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c%2B%2B/5.1.0/backward/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Farch-5Ftree_usr_i686-2Dw64-2Dmingw32_include_c-252B-252B_5.1.0_i686-2Dw64-2Dmingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=lk__HAFXrSp8qEdT9J8F_BFRGfip0T1Uy9UpVVahT7k&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c%2B%2B/5.1.0/i686-w64-mingw32/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Farch-5Ftree_usr_lib_gcc_i686-2Dw64-2Dmingw32_5.1.0_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=rnBe0Hdc8KM_UVJ-z_f4mlsKx0Pudj2bfScVFQxHliA&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Farch-5Ftree_usr_lib_gcc_i686-2Dw64-2Dmingw32_5.1.0_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=BkEe40M1E--pBErCiSCGf7ZM_DPuVMSWiCKftW1hd9E&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/backward/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Fbuilds-5Ftree_mingw32_i686-2Dw64-2Dmingw32_include_c-252B-252B_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=Xb4t5kSTZIc9cQH-8RU3jRGkaSTX49Vf-wC99dpqo-w&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c%2B%2B/backward/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/i686-w64-mingw32/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Fbuilds-5Ftree_mingw32_i686-2Dw64-2Dmingw32_include_c-252B-252B_i686-2Dw64-2Dmingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=pA-D-F-Fs9HJ4b6VU3jDgl6WNo76IUr0qPNk_OtJo9U&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c%2B%2B/i686-w64-mingw32/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Fbuilds-5Ftree_mingw32_lib_gcc_i686-2Dw64-2Dmingw32_4.9.1_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=2cOaEGqHWKjeqVh24Z0y8KuHIitx3Q8dgrxaUVgNQ68&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Fbuilds-5Ftree_mingw32_lib_gcc_i686-2Dw64-2Dmingw32_4.9.1_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=X1ufAhjvpe-WGGkdq0AN79DKiDQKHS4DXHKFecS_jFY&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Forg-5Ftree_mingw_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=zRQIG8V7UH4Oj9RJ41Sd46dscm2repVel5p1qU4utHY&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Forg-5Ftree_mingw_lib_gcc_mingw32_4.8.1_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=S_3P-32dIYDteIoIdiYFoYBFcEHH6GNVisWTjnZV8lQ&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/backward/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Forg-5Ftree_mingw_lib_gcc_mingw32_4.8.1_include_c-252B-252B_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=2TdjSKZ_xcm943zl5iat8h5GQJbOZPhLyQ8lemK7QYo&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c%2B%2B/backward/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/mingw32/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Forg-5Ftree_mingw_lib_gcc_mingw32_4.8.1_include_c-252B-252B_mingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=96zEaigLbJB4zCVJB1-LxmK85b1vxJbWEsyjJgAX35w&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c%2B%2B/mingw32/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmingw-5Forg-5Ftree_mingw_minw32_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=tCepiRFZz94Guv0FAr0V3Oz-4OWTgeeht8X7GyHxpF8&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmsys2-5Ftree_msys64_mingw32_i686-2Dw64-2Dmingw32_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=Jag-wwwNbh6GKfIuEk-EJB0kwblspQkldm_pc-Cj04M&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/backward/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmsys2-5Ftree_msys64_mingw32_include_c-252B-252B_4.9.2_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=V5GyooY5k3ucbb05Vb9BPzadRqJ7GUhTzuyxeUJf1wo&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c%2B%2B/4.9.2/backward/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/i686-w64-mingw32/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmsys2-5Ftree_msys64_mingw32_include_c-252B-252B_4.9.2_i686-2Dw64-2Dmingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=elGcO8fuV3Uv62QkvSvN5v7e60RNGlTkWQEG73XLP2M&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c%2B%2B/4.9.2/i686-w64-mingw32/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmsys2-5Ftree_msys64_mingw32_lib_gcc_i686-2Dw64-2Dmingw32_4.9.2_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=tt9TQ-92HfihoP0vwqnKFTLZLUScquXex60OH7NWo9Q&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fmsys2-5Ftree_msys64_mingw32_lib_gcc_i686-2Dw64-2Dmingw32_4.9.2_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=DdkLhcUPDGel-5N6Zvt6kgyEf49iMakUQ4TgqQvgImI&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fopensuse-5Ftree_usr_lib64_gcc_x86-5F64-2Dw64-2Dmingw32_5.1.0_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=hIrfDHG3QjqN-8d5f8feab8ZS00j_VSmQqq6eEgMYX4&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fopensuse-5Ftree_usr_lib64_gcc_x86-5F64-2Dw64-2Dmingw32_5.1.0_include_c-252B-252B_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=OPOXVP0KylTFAeozYDy6bacZYo7aw18uO2_dfKsYYjo&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c%2B%2B/backward/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fopensuse-5Ftree_usr_lib64_gcc_x86-5F64-2Dw64-2Dmingw32_5.1.0_include_c-252B-252B_x86-5F64-2Dw64-2Dmingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=XXPjWdaFlwwJLUUuTsQMIve8XOhUs4F5zbLLvlJEh8k&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c%2B%2B/x86_64-w64-mingw32/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fopensuse-5Ftree_usr_x86-5F64-2Dw64-2Dmingw32_sys-2Droot_mingw_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=TO9bSqvNdJD7-4bbQS_LI6molrOKb0EvxD5WDvaanms&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/86_64-w64-mingw32/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fubuntu-5Ftree_usr_include_c-252B-252B_4.8_86-5F64-2Dw64-2Dmingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=jLoCOPNQNUsGojffuEUVG0D1p7GMBPVcTc3Nd5Chdgc&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c%2B%2B/4.8/86_64-w64-mingw32/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/backward/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fubuntu-5Ftree_usr_include_c-252B-252B_4.8_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=cQQgNSBY-jXN5j0DPL1NmdRKhuI12noZRVNRLqH4qw8&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c%2B%2B/4.8/backward/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fubuntu-5Ftree_usr_lib_gcc_x86-5F64-2Dw64-2Dmingw32_4.8_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=UjB7iKpyZUoPB4wPUF7C7V-RWZ1-iFwKlyEFT3_wJr4&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fubuntu-5Ftree_usr_lib_gcc_x86-5F64-2Dw64-2Dmingw32_4.8_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=lQAdLFzkJUp2_xu3pCm_Rb96RoK8C-36oz7G8EJP-ik&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/.keep<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_Inputs_mingw-5Fubuntu-5Ftree_usr_x86-5F64-2Dw64-2Dmingw32_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=WgazYn9miFnzmZjki6mLwEdG_T15Q-VTX_yauv-3YUo&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/.keep?rev=243098&view=auto</a><br>
==============================================================================<br>
(empty)<br>
<br>
Removed: cfe/trunk/test/Driver/mingw-linux.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_mingw-2Dlinux.cpp-3Frev-3D243097-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=mVc-ZkmLn0NfsJubj5ZFD4k7-oJOZpQ11N7xgH-ZWkU&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-linux.cpp?rev=243097&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/mingw-linux.cpp (original)<br>
+++ cfe/trunk/test/Driver/mingw-linux.cpp (removed)<br>
@@ -1,20 +0,0 @@<br>
-// XFAIL: system-windows<br>
-// RUN: %clang -target x86_64-pc-windows-gnu -c -### --sysroot=/dummy/x86_64-w64-mingw32/5.1.0 %s 2>&1 | FileCheck -check-prefix=CHECK %s<br>
-<br>
-// CHECK: /usr/x86_64-w64-mingw32/include/c++/<br>
-// CHECK: /usr/x86_64-w64-mingw32/include/c++/x86_64-w64-mingw32/<br>
-// CHECK: /usr/x86_64-w64-mingw32/include/c++/backward<br>
-// CHECK: /usr/x86_64-w64-mingw32/include/c++/5.1.0/<br>
-// CHECK: /usr/x86_64-w64-mingw32/include/c++/5.1.0/x86_64-w64-mingw32/<br>
-// CHECK: /usr/x86_64-w64-mingw32/include/c++/5.1.0/backward<br>
-// CHECK: /usr/include/c++/5.1.0/<br>
-// CHECK: /usr/include/c++/5.1.0/x86_64-w64-mingw32/<br>
-// CHECK: /usr/include/c++/5.1.0/backward<br>
-// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include/c++/<br>
-// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32/<br>
-// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include/c++/backward<br>
-// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include<br>
-// CHECK: /usr/x86_64-w64-mingw32/sys-root/mingw/include<br>
-// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include-fixed<br>
-// CHECK: /usr/x86_64-w64-mingw32/include<br>
-// CHECK: /usr/include<br>
<br>
Removed: cfe/trunk/test/Driver/mingw-win.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_mingw-2Dwin.cpp-3Frev-3D243097-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=p8gLEHhECsFBuqT2QvQ1x8_QRjmUjhl0xpX1l7qDA3g&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-win.cpp?rev=243097&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/mingw-win.cpp (original)<br>
+++ cfe/trunk/test/Driver/mingw-win.cpp (removed)<br>
@@ -1,19 +0,0 @@<br>
-// REQUIRES: system-windows<br>
-// RUN: %clang -target i686-pc-windows-gnu -c -### --sysroot=c:\dummy %s 2>&1 | FileCheck -check-prefix=CHECK %s<br>
-<br>
-// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++<br>
-// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\i686-w64-mingw32\\<br>
-// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\backward<br>
-// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\dummy\\<br>
-// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\dummy\\i686-w64-mingw32\\<br>
-// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\dummy\\backward<br>
-// CHECK: c:\\dummy\\include\\c++\\dummy\\<br>
-// CHECK: c:\\dummy\\include\\c++\\dummy\\i686-w64-mingw32\\<br>
-// CHECK: c:\\dummy\\include\\c++\\dummy\\backward<br>
-// CHECK: c:\\dummy\\include\\c++\\<br>
-// CHECK: c:\\dummy\\include\\c++\\i686-w64-mingw32\\<br>
-// CHECK: c:\\dummy\\include\\c++\\backward<br>
-// CHECK: c:\\dummy\\include<br>
-// CHECK: c:\\dummy\\include-fixed<br>
-// CHECK: c:\\dummy\\i686-w64-mingw32\\include<br>
-// CHECK: c:\\dummy\\include<br>
<br>
Added: cfe/trunk/test/Driver/mingw.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Driver_mingw.cpp-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=h374FtIzVopOvdT8bK019_4K0F9lOB_kfXmFoJ_UI7M&s=_9x_1RXD0eA891LjI2tUoeGnFphnVOIT2ZG8JhrPfg4&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw.cpp?rev=243098&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/mingw.cpp (added)<br>
+++ cfe/trunk/test/Driver/mingw.cpp Fri Jul 24 03:50:15 2015<br>
@@ -0,0 +1,54 @@<br>
+// RUN: %clang -target i686-pc-windows-gnu -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>
+// CHECK_MINGW_ORG_TREE: "{{.*}}{{/|\\\\}}Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"<br>
+// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include"<br>
+// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include-fixed"<br>
+// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}mingw32{{/|\\\\}}include"<br>
+// CHECK_MINGW_ORG_TREE: {{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}include<br>
+<br>
+<br>
+// RUN: %clang -target i686-pc-windows-gnu -c -### --sysroot=%S/Inputs/mingw_mingw_builds_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_BUILDS_TREE %s<br>
+// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++"<br>
+// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}i686-w64-mingw32"<br>
+// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"<br>
+// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include"<br>
+// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include-fixed"<br>
+// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"<br>
+<br>
+<br>
+// RUN: %clang -target i686-pc-windows-gnu -c -### --sysroot=%S/Inputs/mingw_msys2_tree/msys64/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_MSYS_TREE %s<br>
+// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64{{/|\\\\}}mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2"<br>
+// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}i686-w64-mingw32"<br>
+// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}backward"<br>
+// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include"<br>
+// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include-fixed"<br>
+// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"<br>
+// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include"<br>
+<br>
+<br>
+// RUN: %clang -target x86_64-pc-windows-gnu -c -### --sysroot=%S/Inputs/mingw_opensuse_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_OPENSUSE_TREE %s<br>
+// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++"<br>
+// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}x86_64-w64-mingw32"<br>
+// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"<br>
+// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include"<br>
+// CHECK_MINGW_OPENSUSE_TREE: "/usr/x86_64-w64-mingw32/sys-root/mingw/include"<br>
+// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"<br>
+<br>
+<br>
+// RUN: %clang -target i686-pc-windows-gnu -c -### --sysroot=%S/Inputs/mingw_arch_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ARCH_TREE %s<br>
+// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0"<br>
+// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}i686-w64-mingw32"<br>
+// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}backward"<br>
+// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include"<br>
+// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"<br>
+// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"<br>
+<br>
+<br>
+// RUN: %clang -target x86_64-pc-windows-gnu -c -### --sysroot=%S/Inputs/mingw_ubuntu_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_UBUNTU_TREE %s<br>
+// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8"<br>
+// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}x86_64-w64-mingw32"<br>
+// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}backward"<br>
+// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include"<br>
+// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include-fixed"<br>
+// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}include"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>