[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cfe-commits
Subject:    Re: r243098 - Add extensive tests for the mingw toolchain and remove trailing slash from Arch.
From:       Yaron Keren <yaron.keren () gmail ! com>
Date:       2015-07-24 19:50:07
Message-ID: CANa4zJqFpHVQzGGJn2KBUfNGVDgrAgHVANFEdp83=+-OaLEu4w () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


r243144.


2015-07-24 22:09 GMT+03:00 Yaron Keren <yaron.keren@gmail.com>:

> Initially sys_root path was #ifdef for non-Windows only but then the test
> for the sys_root path fails on Windows since the path is missing. We could
> make a specific non-Windows test just for sysroot but then this would not
> be tested on Windows and the test coverage is lacking. I prefer the Windows
> test to test as much as possible.
> 
> OTOH, adding the sys_root path on Windows is practically meaningless as it
> will not be found on the system and filtered out by HeaderSearch, as are
> several more unexisting paths. Every one of the six Linux distributions had
> a *unique* collection of include paths, especially C++ ones, as documented
> in the source code and tested.
> clang does not know which Linux (or which Windows toolchain) it's running
> on, the mingw driver has to add all likely paths which are filtered later.
> 
> So as the sys_root path is really intended to work (as opposed to be
> tested) on Linux only I kept the unix slashes.
> 
> Your second comment is correct: the include path should be based on
> sysroot and arch like the first one.
> I will fix that.
> 
> 
> 2015-07-24 21:40 GMT+03:00 Richard Smith <richard@metafoo.co.uk>:
> 
> > On Fri, Jul 24, 2015 at 1:50 AM, Yaron Keren <yaron.keren@gmail.com>
> > wrote:
> > 
> > > Author: yrnkrn
> > > Date: Fri Jul 24 03:50:15 2015
> > > New Revision: 243098
> > > 
> > > URL: http://llvm.org/viewvc/llvm-project?rev=243098&view=rev
> > > 
> > > Log:
> > > Add extensive tests for the mingw toolchain and remove trailing slash
> > > from Arch.
> > > 
> > > Address Richard Smith comments: remove the trailing seperator from the
> > > Arch
> > > variable, implement six mingw_* trees under tools/clangtest/Driver/Inputs
> > > and merge linux and Windows tests into a universal test that uses these
> > > trees.
> > > 
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/backward/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/backward/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/i686-w64-mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/i686-w64-mingw32/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/.keep
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/backward/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/backward/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/mingw32/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/backward/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/backward/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/i686-w64-mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/i686-w64-mingw32/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32/
> > >  
> > > 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
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/86_64-w64-mingw32/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/86_64-w64-mingw32/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/backward/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/backward/.keep
> > >  cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/.keep
> > >  
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/
> > > 
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/.keep
> > >  cfe/trunk/test/Driver/mingw.cpp
> > > Removed:
> > > cfe/trunk/test/Driver/mingw-linux.cpp
> > > cfe/trunk/test/Driver/mingw-win.cpp
> > > Modified:
> > > cfe/trunk/lib/Driver/MinGWToolChain.cpp
> > > 
> > > Modified: cfe/trunk/lib/Driver/MinGWToolChain.cpp
> > > URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MinGWToolChain.cpp?rev=243098&r1=243097&r2=243098&view=diff
> > >  
> > > 
> > > ==============================================================================
> > > --- cfe/trunk/lib/Driver/MinGWToolChain.cpp (original)
> > > +++ cfe/trunk/lib/Driver/MinGWToolChain.cpp Fri Jul 24 03:50:15 2015
> > > @@ -40,7 +40,7 @@ void MinGW::findGccLibDir() {
> > > if (!EC) {
> > > GccLibDir = MingwOrgEntry->path();
> > > // Replace Arch with mingw32 arch.
> > > -      Arch = "mingw32//";
> > > +      Arch = "mingw32";
> > > break;
> > > }
> > > }
> > > @@ -51,8 +51,7 @@ MinGW::MinGW(const Driver &D, const llvm
> > > getProgramPaths().push_back(getDriver().getInstalledDir());
> > > 
> > > // Default Arch is mingw-w64.
> > > -  Arch = (getTriple().getArchName() + "-w64-mingw32" +
> > > -          llvm::sys::path::get_separator()).str();
> > > +  Arch = (getTriple().getArchName() + "-w64-mingw32").str();
> > > 
> > > // In Windows there aren't any standard install locations, we search
> > > // for gcc on the PATH. In Linux the base is always /usr.
> > > @@ -66,25 +65,23 @@ MinGW::MinGW(const Driver &D, const llvm
> > > else
> > > Base = llvm::sys::path::parent_path(getDriver().getInstalledDir());
> > > #else
> > > -  Base = "/usr";
> > > +  if (getDriver().SysRoot.size())
> > > +    Base = getDriver().SysRoot;
> > > +  else
> > > +    Base = "/usr";
> > > #endif
> > > 
> > > Base += llvm::sys::path::get_separator();
> > > -  if (getDriver().SysRoot.size())
> > > -    GccLibDir = getDriver().SysRoot;
> > > -  else
> > > -    findGccLibDir();
> > > +  findGccLibDir();
> > > Ver = llvm::sys::path::filename(GccLibDir);
> > > // GccLibDir must precede Base/lib so that the
> > > // correct crtbegin.o ,cetend.o would be found.
> > > getFilePaths().push_back(GccLibDir);
> > > -  getFilePaths().push_back(Base + Arch + "lib");
> > > -#ifdef LLVM_ON_WIN32
> > > +  getFilePaths().push_back(
> > > +      (Base + Arch + llvm::sys::path::get_separator() + "lib").str());
> > > getFilePaths().push_back(Base + "lib");
> > > -#else
> > > // openSUSE
> > > -  getFilePaths().push_back(Base + Arch + "sys-root/mingw/lib");
> > > -#endif
> > > +  getFilePaths().push_back(Base + Arch + "/sys-root/mingw/lib");
> > > 
> > 
> > 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?
> > 
> > }
> > > 
> > > bool MinGW::IsIntegratedAssemblerDefault() const { return true; }
> > > @@ -129,29 +126,29 @@ bool MinGW::UseSEHExceptions() const {
> > > // Include directories for various hosts:
> > > 
> > > // Windows, mingw.org
> > > 
> > > -// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++
> > > -// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\mingw32
> > > -// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\backward
> > > -// c:\mingw\lib\gcc\mingw32\4.8.1\include
> > > -// c:\mingw\include
> > > -// c:\mingw\lib\gcc\mingw32\4.8.1\include-fixed
> > > +// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++
> > > +// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\mingw32
> > > +// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\backward
> > > +// c:\mingw\lib\gcc\mingw32\4.8.1\include
> > > +// c:\mingw\include
> > > +// c:\mingw\lib\gcc\mingw32\4.8.1\include-fixed
> > > // c:\mingw\mingw32\include
> > > 
> > > // Windows, mingw-w64 mingw-builds
> > > -// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include
> > > -// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include-fixed
> > > -// c:\mingw32\i686-w64-mingw32\include
> > > -// c:\mingw32\i686-w64-mingw32\include\c++
> > > -// c:\mingw32\i686-w64-mingw32\include\c++\i686-w64-mingw32
> > > -// c:\mingw32\i686-w64-mingw32\include\c++\backward
> > > +// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include
> > > +// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include-fixed
> > > +// c:\mingw32\i686-w64-mingw32\include
> > > +// c:\mingw32\i686-w64-mingw32\include\c++
> > > +// c:\mingw32\i686-w64-mingw32\include\c++\i686-w64-mingw32
> > > +// c:\mingw32\i686-w64-mingw32\include\c++\backward
> > > 
> > > // Windows, mingw-w64 msys2
> > > -// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include
> > > -// c:\msys64\mingw32\include
> > > -// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include-fixed
> > > -// c:\msys64\mingw32\i686-w64-mingw32\include
> > > -// c:\msys64\mingw32\include\c++\4.9.2
> > > -// c:\msys64\mingw32\include\c++\4.9.2\i686-w64-mingw32
> > > +// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include
> > > +// c:\msys64\mingw32\include
> > > +// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include-fixed
> > > +// c:\msys64\mingw32\i686-w64-mingw32\include
> > > +// c:\msys64\mingw32\include\c++\4.9.2
> > > +// c:\msys64\mingw32\include\c++\4.9.2\i686-w64-mingw32
> > > // c:\msys64\mingw32\include\c++\4.9.2\backward
> > > 
> > > // openSUSE
> > > @@ -163,20 +160,20 @@ bool MinGW::UseSEHExceptions() const {
> > > // /usr/x86_64-w64-mingw32/sys-root/mingw/include
> > > 
> > > // Arch Linux
> > > -// /usr/i686-w64-mingw32/include/c++/5.1.0
> > > -// /usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32
> > > -// /usr/i686-w64-mingw32/include/c++/5.1.0/backward
> > > -// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include
> > > -// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed
> > > +// /usr/i686-w64-mingw32/include/c++/5.1.0
> > > +// /usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32
> > > +// /usr/i686-w64-mingw32/include/c++/5.1.0/backward
> > > +// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include
> > > +// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed
> > > // /usr/i686-w64-mingw32/include
> > > 
> > > // Ubuntu
> > > -// /usr/include/c++/4.8
> > > -// /usr/include/c++/4.8/x86_64-w64-mingw32
> > > -// /usr/include/c++/4.8/backward
> > > -// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include
> > > -// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed
> > > -// /usr/x86_64-w64-mingw32/include
> > > +// /usr/include/c++/4.8
> > > +// /usr/include/c++/4.8/x86_64-w64-mingw32
> > > +// /usr/include/c++/4.8/backward
> > > +// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include
> > > +// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed
> > > +// /usr/x86_64-w64-mingw32/include
> > > 
> > > void MinGW::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
> > > ArgStringList &CC1Args) const {
> > > @@ -197,14 +194,13 @@ void MinGW::AddClangSystemIncludeArgs(co
> > > llvm::sys::path::append(IncludeDir, "include");
> > > addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());
> > > IncludeDir += "-fixed";
> > > -#ifdef LLVM_ON_UNIX
> > > // openSUSE
> > > addSystemInclude(DriverArgs, CC1Args,
> > > "/usr/x86_64-w64-mingw32/sys-root/mingw/include");
> > > 
> > 
> > Likewise here. Plus, shouldn't this path be affected by the sysroot, and
> > by the architecture?
> > 
> > 
> > > -#endif
> > > addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());
> > > }
> > > -  addSystemInclude(DriverArgs, CC1Args, Base + Arch + "include");
> > > +  addSystemInclude(DriverArgs, CC1Args,
> > > +                   Base + Arch + llvm::sys::path::get_separator() +
> > > "include");
> > > addSystemInclude(DriverArgs, CC1Args, Base + "include");
> > > }
> > > 
> > > @@ -216,9 +212,9 @@ void MinGW::AddClangCXXStdlibIncludeArgs
> > > 
> > > switch (GetCXXStdlibType(DriverArgs)) {
> > > case ToolChain::CST_Libcxx:
> > > -    addSystemInclude(DriverArgs, CC1Args, Base        + "include" +
> > > -                     llvm::sys::path::get_separator() + "c++"     +
> > > -                     llvm::sys::path::get_separator() + "v1");
> > > +    addSystemInclude(DriverArgs, CC1Args,
> > > +                     Base + "include" +
> > > llvm::sys::path::get_separator() +
> > > +                         "c++" + llvm::sys::path::get_separator() +
> > > "v1");
> > > break;
> > > 
> > > case ToolChain::CST_Libstdcxx:
> > > @@ -232,8 +228,8 @@ void MinGW::AddClangCXXStdlibIncludeArgs
> > > CppIncludeBases.emplace_back(GccLibDir);
> > > llvm::sys::path::append(CppIncludeBases[3], "include", "c++");
> > > for (auto &CppIncludeBase : CppIncludeBases) {
> > > -      CppIncludeBase += llvm::sys::path::get_separator();
> > > addSystemInclude(DriverArgs, CC1Args, CppIncludeBase);
> > > +      CppIncludeBase += llvm::sys::path::get_separator();
> > > addSystemInclude(DriverArgs, CC1Args, CppIncludeBase + Arch);
> > > addSystemInclude(DriverArgs, CC1Args, CppIncludeBase +
> > > "backward");
> > > }
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/backward/.keep
> > >  URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_bui \
> > > lds_tree/mingw32/i686-w64-mingw32/include/c%2B%2B/backward/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/i686-w64-mingw32/.keep
> > >  URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_bui \
> > > lds_tree/mingw32/i686-w64-mingw32/include/c%2B%2B/i686-w64-mingw32/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep
> > >  URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_bui \
> > > lds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep
> > >  URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_bui \
> > > lds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/.keep
> > > URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/backward/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/mingw32/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep
> > > URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/backward/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/i686-w64-mingw32/.keep
> > >  URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tre \
> > > e/msys64/mingw32/include/c%2B%2B/4.9.2/i686-w64-mingw32/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep
> > >  URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tre \
> > > e/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep
> > >  URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/mingw_msys2_tre \
> > > e/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep?rev=243098&view=auto
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > 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
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/86_64-w64-mingw32/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/backward/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Added:
> > > cfe/trunk/test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/.keep
> > >  URL:
> > > 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
> > >  
> > > ==============================================================================
> > > (empty)
> > > 
> > > Removed: cfe/trunk/test/Driver/mingw-linux.cpp
> > > URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-linux.cpp?rev=243097&view=auto
> > >  
> > > 
> > > ==============================================================================
> > > --- cfe/trunk/test/Driver/mingw-linux.cpp (original)
> > > +++ cfe/trunk/test/Driver/mingw-linux.cpp (removed)
> > > @@ -1,20 +0,0 @@
> > > -// XFAIL: system-windows
> > > -// 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
> > > -
> > > -// CHECK: /usr/x86_64-w64-mingw32/include/c++/
> > > -// CHECK: /usr/x86_64-w64-mingw32/include/c++/x86_64-w64-mingw32/
> > > -// CHECK: /usr/x86_64-w64-mingw32/include/c++/backward
> > > -// CHECK: /usr/x86_64-w64-mingw32/include/c++/5.1.0/
> > > -// CHECK: /usr/x86_64-w64-mingw32/include/c++/5.1.0/x86_64-w64-mingw32/
> > > -// CHECK: /usr/x86_64-w64-mingw32/include/c++/5.1.0/backward
> > > -// CHECK: /usr/include/c++/5.1.0/
> > > -// CHECK: /usr/include/c++/5.1.0/x86_64-w64-mingw32/
> > > -// CHECK: /usr/include/c++/5.1.0/backward
> > > -// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include/c++/
> > > -// CHECK:
> > > /dummy/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32/
> > > -// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include/c++/backward
> > > -// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include
> > > -// CHECK: /usr/x86_64-w64-mingw32/sys-root/mingw/include
> > > -// CHECK: /dummy/x86_64-w64-mingw32/5.1.0/include-fixed
> > > -// CHECK: /usr/x86_64-w64-mingw32/include
> > > -// CHECK: /usr/include
> > > 
> > > Removed: cfe/trunk/test/Driver/mingw-win.cpp
> > > URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-win.cpp?rev=243097&view=auto
> > >  
> > > ==============================================================================
> > > --- cfe/trunk/test/Driver/mingw-win.cpp (original)
> > > +++ cfe/trunk/test/Driver/mingw-win.cpp (removed)
> > > @@ -1,19 +0,0 @@
> > > -// REQUIRES: system-windows
> > > -// RUN: %clang -target i686-pc-windows-gnu -c -### --sysroot=c:\dummy
> > > %s 2>&1 | FileCheck -check-prefix=CHECK %s
> > > -
> > > -// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++
> > > -// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\i686-w64-mingw32\\
> > > -// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\backward
> > > -// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\dummy\\
> > > -// CHECK:
> > > c:\\dummy\\i686-w64-mingw32\\include\\c++\\dummy\\i686-w64-mingw32\\
> > > -// CHECK: c:\\dummy\\i686-w64-mingw32\\include\\c++\\dummy\\backward
> > > -// CHECK: c:\\dummy\\include\\c++\\dummy\\
> > > -// CHECK: c:\\dummy\\include\\c++\\dummy\\i686-w64-mingw32\\
> > > -// CHECK: c:\\dummy\\include\\c++\\dummy\\backward
> > > -// CHECK: c:\\dummy\\include\\c++\\
> > > -// CHECK: c:\\dummy\\include\\c++\\i686-w64-mingw32\\
> > > -// CHECK: c:\\dummy\\include\\c++\\backward
> > > -// CHECK: c:\\dummy\\include
> > > -// CHECK: c:\\dummy\\include-fixed
> > > -// CHECK: c:\\dummy\\i686-w64-mingw32\\include
> > > -// CHECK: c:\\dummy\\include
> > > 
> > > Added: cfe/trunk/test/Driver/mingw.cpp
> > > URL:
> > > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw.cpp?rev=243098&view=auto
> > >  
> > > 
> > > ==============================================================================
> > > --- cfe/trunk/test/Driver/mingw.cpp (added)
> > > +++ cfe/trunk/test/Driver/mingw.cpp Fri Jul 24 03:50:15 2015
> > > @@ -0,0 +1,54 @@
> > > +// 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
> > > +// CHECK_MINGW_ORG_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++"
> > >  +// CHECK_MINGW_ORG_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32"
> > >  +// CHECK_MINGW_ORG_TREE:
> > > "{{.*}}{{/|\\\\}}Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
> > >  +// CHECK_MINGW_ORG_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include"
> > >  +// CHECK_MINGW_ORG_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include-fixed"
> > >  +// CHECK_MINGW_ORG_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}mingw32{{/|\\\\}}include"
> > > +// CHECK_MINGW_ORG_TREE:
> > > {{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}include
> > > +
> > > +
> > > +// 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
> > > +// CHECK_MINGW_BUILDS_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++"
> > >  +// CHECK_MINGW_BUILDS_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}i686-w64-mingw32"
> > >  +// CHECK_MINGW_BUILDS_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
> > >  +// CHECK_MINGW_BUILDS_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include"
> > >  +// CHECK_MINGW_BUILDS_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include-fixed"
> > >  +// CHECK_MINGW_BUILDS_TREE:
> > > "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
> > >  +
> > > +
> > > +// 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
> > > +// CHECK_MINGW_MSYS_TREE:
> > > "{{.*}}/Inputs/mingw_msys2_tree/msys64{{/|\\\\}}mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2"
> > >  +// CHECK_MINGW_MSYS_TREE:
> > > "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}i686-w64-mingw32"
> > >  +// CHECK_MINGW_MSYS_TREE:
> > > "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}backward"
> > >  +// CHECK_MINGW_MSYS_TREE:
> > > "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include"
> > >  +// CHECK_MINGW_MSYS_TREE:
> > > "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include-fixed"
> > >  +// CHECK_MINGW_MSYS_TREE:
> > > "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
> > >  +// CHECK_MINGW_MSYS_TREE:
> > > "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include"
> > > +
> > > +
> > > +// 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
> > > +// CHECK_MINGW_OPENSUSE_TREE:
> > > "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++"
> > >  +// CHECK_MINGW_OPENSUSE_TREE:
> > > "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_ \
> > > 64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}x86_64-w64-mingw32"
> > >  +// CHECK_MINGW_OPENSUSE_TREE:
> > > "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
> > >  +// CHECK_MINGW_OPENSUSE_TREE:
> > > "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include"
> > >  +// CHECK_MINGW_OPENSUSE_TREE:
> > > "/usr/x86_64-w64-mingw32/sys-root/mingw/include"
> > > +// CHECK_MINGW_OPENSUSE_TREE:
> > > "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"
> > >  +
> > > +
> > > +// 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
> > > +// CHECK_MINGW_ARCH_TREE:
> > > "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0"
> > >  +// CHECK_MINGW_ARCH_TREE:
> > > "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}i686-w64-mingw32"
> > >  +// CHECK_MINGW_ARCH_TREE:
> > > "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}backward"
> > >  +// CHECK_MINGW_ARCH_TREE:
> > > "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include"
> > >  +// CHECK_MINGW_ARCH_TREE:
> > > "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"
> > >  +// CHECK_MINGW_ARCH_TREE:
> > > "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
> > > +
> > > +
> > > +// 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
> > > +// CHECK_MINGW_UBUNTU_TREE:
> > > "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8"
> > >  +// CHECK_MINGW_UBUNTU_TREE:
> > > "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}x86_64-w64-mingw32"
> > >  +// CHECK_MINGW_UBUNTU_TREE:
> > > "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}backward"
> > >  +// CHECK_MINGW_UBUNTU_TREE:
> > > "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include"
> > >  +// CHECK_MINGW_UBUNTU_TREE:
> > > "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include-fixed"
> > >  +// CHECK_MINGW_UBUNTU_TREE:
> > > "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}include"
> > >  
> > > 
> > > _______________________________________________
> > > cfe-commits mailing list
> > > cfe-commits@cs.uiuc.edu
> > > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
> > > 
> > 
> > 


[Attachment #5 (text/html)]

<div dir="rtl"><div dir="ltr">r243144.<br></div><div dir="ltr"><br></div></div><div \
class="gmail_extra"><div dir="ltr"><br><div class="gmail_quote">2015-07-24 22:09 \
GMT+03:00 Yaron Keren <span dir="ltr">&lt;<a href="mailto:yaron.keren@gmail.com" \
target="_blank">yaron.keren@gmail.com</a>&gt;</span>:<br><blockquote \
class="gmail_quote" style="margin:0 .8ex;border-left:1px #ccc solid;border-right:1px \
#ccc solid;padding-left:1ex;padding-right:1ex"><div dir="rtl"><div dir="ltr"><div \
dir="ltr">Initially sys_root path was #ifdef for non-Windows only but then the test \
for the sys_root path fails on Windows since the path is missing. We could make a \
specific non-Windows test just for sysroot but then this would not be tested on \
Windows and the test coverage is lacking. I prefer the Windows test to test as much \
as possible.</div><div dir="ltr"><br></div><div>OTOH, adding the sys_root path on \
Windows is practically meaningless as it will not be found on the system and filtered \
out by HeaderSearch, as are several more unexisting paths. Every one of the six Linux \
distributions had a *unique* collection of include paths, especially C++ ones, as \
documented in the source code and tested.  </div><div>clang does not know which Linux \
(or which Windows toolchain) it&#39;s running on, the mingw driver has to add all \
likely paths which are filtered later.  </div></div><div dir="ltr"><br></div><div \
dir="ltr">So as the sys_root path is really intended to work (as opposed to be \
tested) on Linux only I kept the unix slashes.  </div><div dir="ltr"><br></div><div \
dir="ltr">Your second comment is correct: the include path should be based on sysroot \
and arch like the first one.</div><div dir="ltr">I will fix that.</div><div \
dir="ltr"><br></div></div><div class="HOEnZb"><div class="h5"><div \
class="gmail_extra"><div dir="ltr"><br><div class="gmail_quote">2015-07-24 21:40 \
GMT+03:00 Richard Smith <span dir="ltr">&lt;<a href="mailto:richard@metafoo.co.uk" \
target="_blank">richard@metafoo.co.uk</a>&gt;</span>:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div class="gmail_extra"><div class="gmail_quote"><span>On \
Fri, Jul 24, 2015 at 1:50 AM, Yaron Keren <span dir="ltr">&lt;<a \
href="mailto:yaron.keren@gmail.com" \
target="_blank">yaron.keren@gmail.com</a>&gt;</span> wrote:<br></span><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
                solid;padding-left:1ex"><span>Author: yrnkrn<br>
Date: Fri Jul 24 03:50:15 2015<br>
New Revision: 243098<br>
<br></span>
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=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=eWItFYtkb0mAnoh2cD3pozSzUAPJGtX9Yd3zjHB8-7Y&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=243098&amp;view=rev</a><div><div><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></div></div>
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-3 \
D243098-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM \
_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=Tf1FlcmJvZmXQ9ypeihRq7BUs32rrxcgMOlGZCia8c8&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Dri \
ver/MinGWToolChain.cpp?rev=243098&amp;r1=243097&amp;r2=243098&amp;view=diff</a><div><div><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-&gt;path();<br>
           // Replace Arch with mingw32 arch.<br>
-         Arch = &quot;mingw32//&quot;;<br>
+         Arch = &quot;mingw32&quot;;<br>
           break;<br>
        }<br>
     }<br>
@@ -51,8 +51,7 @@ MinGW::MinGW(const Driver &amp;D, const llvm<br>
     getProgramPaths().push_back(getDriver().getInstalledDir());<br>
<br>
     // Default Arch is mingw-w64.<br>
-   Arch = (getTriple().getArchName() + &quot;-w64-mingw32&quot; +<br>
-               llvm::sys::path::get_separator()).str();<br>
+   Arch = (getTriple().getArchName() + &quot;-w64-mingw32&quot;).str();<br>
<br>
  // In Windows there aren&#39;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 &amp;D, const llvm<br>
     else<br>
        Base = llvm::sys::path::parent_path(getDriver().getInstalledDir());<br>
  #else<br>
-   Base = &quot;/usr&quot;;<br>
+   if (getDriver().SysRoot.size())<br>
+      Base = getDriver().SysRoot;<br>
+   else<br>
+      Base = &quot;/usr&quot;;<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 + &quot;lib&quot;);<br>
-#ifdef LLVM_ON_WIN32<br>
+   getFilePaths().push_back(<br>
+         (Base + Arch + llvm::sys::path::get_separator() + \
&quot;lib&quot;).str());<br>  getFilePaths().push_back(Base + &quot;lib&quot;);<br>
-#else<br>
     // openSUSE<br>
-   getFilePaths().push_back(Base + Arch + &quot;sys-root/mingw/lib&quot;);<br>
-#endif<br>
+   getFilePaths().push_back(Base + Arch + \
&quot;/sys-root/mingw/lib&quot;);<br></div></div></blockquote><div><br></div><div>You \
now appear to be unconditionally adding this path with Unix directory separators, \
even when on Windows. That doesn&#39;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"><span>  }<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></span>
  // Windows, <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__mingw.org&d \
=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvO \
whYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=zkh34Ry14AcZ_rvpJbxw0AlLyw2Xqhms3HxVFYVbuGU&e=" \
                rel="noreferrer" target="_blank">mingw.org</a><div><div><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 &amp;DriverArgs,<br>
                                                           ArgStringList \
&amp;CC1Args) const {<br> @@ -197,14 +194,13 @@ void \
MinGW::AddClangSystemIncludeArgs(co<br>  llvm::sys::path::append(IncludeDir, \
&quot;include&quot;);<br>  addSystemInclude(DriverArgs, CC1Args, \
IncludeDir.c_str());<br>  IncludeDir += &quot;-fixed&quot;;<br>
-#ifdef LLVM_ON_UNIX<br>
        // openSUSE<br>
        addSystemInclude(DriverArgs, CC1Args,<br>
                                 \
&quot;/usr/x86_64-w64-mingw32/sys-root/mingw/include&quot;);<br></div></div></blockquote><div><br></div><div>Likewise \
here. Plus, shouldn&#39;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"><div><div>
-#endif<br>
        addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());<br>
     }<br>
-   addSystemInclude(DriverArgs, CC1Args, Base + Arch + &quot;include&quot;);<br>
+   addSystemInclude(DriverArgs, CC1Args,<br>
+                             Base + Arch + llvm::sys::path::get_separator() + \
                &quot;include&quot;);<br>
     addSystemInclude(DriverArgs, CC1Args, Base + &quot;include&quot;);<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            + &quot;include&quot; \
                +<br>
-                                llvm::sys::path::get_separator() + &quot;c++&quot;   \
                +<br>
-                                llvm::sys::path::get_separator() + \
&quot;v1&quot;);<br> +      addSystemInclude(DriverArgs, CC1Args,<br>
+                                Base + &quot;include&quot; + \
llvm::sys::path::get_separator() +<br> +                                      \
&quot;c++&quot; + llvm::sys::path::get_separator() + &quot;v1&quot;);<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], &quot;include&quot;, \
&quot;c++&quot;);<br>  for (auto &amp;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 + \
&quot;backward&quot;);<br>  }<br>
<br>
Added: cfe/trunk/test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/.keep<br></div></div>
                
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_i \
nclude_c-252B-252B_5.1.0_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZ \
cy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=qYjQa8wiFO2O7R69EVgX6csfWzN4O3bpiRlI0ixk160&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c%2B%2B/5.1.0/backward/.keep?rev=243098&amp;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_i \
nclude_c-252B-252B_5.1.0_i686-2Dw64-2Dmingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwM \
FaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJ \
Lsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=b1OOyb0jQKLCcxZ8e39oEzjUj8S3Qk2XgOJ0qkuF4bc&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c%2B%2B/5.1.0/i686-w64-mingw32/.keep?rev=243098&amp;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-2Dm \
ingw32_5.1.0_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z- \
Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=BGg6rGnem0yrRVR7LOx-LevWaGyuqCycBtUj2uOS5g0&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/.keep?rev=243098&amp;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-2Dm \
ingw32_5.1.0_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlk \
tOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=oMt9aTZJULdcn8_gW4BKRKesQYR3L3P1GSy8GfOzF9Q&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/.keep?rev=243098&amp;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-2Dw \
64-2Dmingw32_include_c-252B-252B_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ& \
c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=yknWJ46b-Bww2ld5M7p2A-6WjweHv0PZaIlKvTQdzhI&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c%2B%2B/backward/.keep?rev=243098&amp;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-2Dw \
64-2Dmingw32_include_c-252B-252B_i686-2Dw64-2Dmingw32_.keep-3Frev-3D243098-26view-3Dau \
to&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S \
5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=P0rWRPJdRzwFnsURkxLTC_VluTYfxigsXp5Iwy3Udqk&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c%2B%2B/i686-w64-mingw32/.keep?rev=243098&amp;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=S5wvOwhYJLsl \
0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=dSt7X3xkvR8zbO4anlDWmdvZEJ8_2HXzsjE-oYOZW1E&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep?rev=243098&amp;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=8hUWF \
Zcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=xU4eVSB50JZNHJCZ4-UzkMibOX3pfj6_ZbyyqA96sEc&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep?rev=243098&amp;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_Ob8SyngJ \
70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=8hPsW4sbVs4bJaMkUYaZLKD7oG2s55mAGt7OwSv9ncM&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_org_tree/mingw/include/.keep?rev=243098&amp;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_mingw \
32_4.8.1_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5r \
BPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=CPneoyrm5M7L9G5-doN1G8P6eqPBH23mP5paS13fsGE&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/.keep?rev=243098&amp;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_mingw \
32_4.8.1_include_c-252B-252B_backward_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8h \
UWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=TBJZmWwJSz7uYygIbMNl0mLbTGlHjeH9Uow60at2p20&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c%2B%2B/backward/.keep?rev=243098&amp;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_mingw \
32_4.8.1_include_c-252B-252B_mingw32_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hU \
WFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=wBVyFjwblnUpeZvF1LLgkii9a-8fv6tJK9RLGL6XsbI&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c%2B%2B/mingw32/.keep?rev=243098&amp;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_includ \
e_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_O \
b8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=E_-VXGH_koCLbBH5v_daAOsdIDdk99BeFV_jNE7S9yc&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep?rev=243098&amp;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-Za5rBPlktO \
Q&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=VfChcIuf79al31MJQECCveoUACnSQ51sOz6vVL6n6fE&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/.keep?rev=243098&amp;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-Za5r \
BPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=UWVBmCFBtoNu6pIar3VDwQZ64JdqFBHERKrDmiLTDSs&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c%2B%2B/4.9.2/backward/.keep?rev=243098&amp;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=8hU \
WFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=kvQtjM7AOqoniGPgSIx0vA0b-zTdrz5l8BxLPyvn5Nc&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c%2B%2B/4.9.2/i686-w64-mingw32/.keep?rev=243098&amp;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_i6 \
86-2Dw64-2Dmingw32_4.9.2_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c \
=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=jAYYJDcZTxhtiRjvTeCegeJKTZ2IJPSCOYQ7qt6F4WM&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep?rev=243098&amp;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_i6 \
86-2Dw64-2Dmingw32_4.9.2_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZc \
y2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=Mvx4-37ZCGJ6ZICp_Zcea8NxP8Dx-ggW2I1e8FwmxLU&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep?rev=243098&amp;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=8 \
hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=cilH2QE0_6XNPLUl7p-26JqX5_dVyfnnfwOPGNHVHvg&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/.keep?rev=243098&amp;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=S5w \
vOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=Ngz1nlwSiFsNZ32OZaJZGhyqgcPEJ-mhm7jA6kZMFSE&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c%2B%2B/backward/.keep?rev=243098&amp;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-3D2430 \
98-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASRO \
nREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=jGE8d4VbSHl6_YvK4z2jkhWg34y2UpTKELA86Nj22Hc&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/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&amp;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-2Dm \
ingw32_sys-2Droot_mingw_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy \
2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=JAI5-WDE06g13voYBGZJPHfG-oLF5qSGd-VJ9K2R9zY&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/.keep?rev=243098&amp;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-Z \
a5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=qrZnap_ia1-CHUSrNLTTB8ozLsp1hRv8cZt65x_KcZo&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_ubuntu_tree/usr/include/c%2B%2B/4.8/86_64-w64-mingw32/.keep?rev=243098&amp;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=BS \
qEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=lCUfHaf8rDD68bSxGl9DuGaVYMMwd4m7UA_xm9qgrGg&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_ubuntu_tree/usr/include/c%2B%2B/4.8/backward/.keep?rev=243098&amp;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-2Dw \
64-2Dmingw32_4.8_include-2Dfixed_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZc \
y2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=HUlAq-c25K5MOAIuuS9JvP8Ctv-Vvw6mtM8gjT86Ua4&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/.keep?rev=243098&amp;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-2Dw \
64-2Dmingw32_4.8_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5r \
BPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=7Nn-Czv8AtJb7zvvkaiKf4HaqTUjyGwVNfVWKSKTETs&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/.keep?rev=243098&amp;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-2Dmin \
gw32_include_.keep-3Frev-3D243098-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BS \
qEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=-Y3Xcu91s2jOgo0GpdtrQOwfCDjtytZQpY24hlN2mFw&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Dr \
iver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/.keep?rev=243098&amp;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=AwMF \
aQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJL \
sl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=IcHxzM9h1_VVstokIZ_ClgNq9Fn0XivR-kUftIAVsjE&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-linux.cpp?rev=243097&amp;view=auto</a><div><div><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&gt;&amp;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></div></div>
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=S5wvOwhYJLsl \
0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=f2QG5GDs61dnOXRPqYHKz12YMNXpBuTcRzVhnsno4po&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-win.cpp?rev=243097&amp;view=auto</a><span><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&gt;&amp;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></span>
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=8hU \
WFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=S5wvOwhYJLsl0K-_WA0eNhPy6oI6v4nJtRg4KqAokQQ&s=Jb_a1HHvGwIlIY846QiOibkWUvKkTYRiIhED8iOrD7U&e=" \
rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw.cpp?rev=243098&amp;view=auto</a><div><div><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&gt;&amp;1 | FileCheck \
-check-prefix=CHECK_MINGW_ORG_TREE %s<br> +// CHECK_MINGW_ORG_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++&quot;<br>
 +// CHECK_MINGW_ORG_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32&quot;<br>
 +// CHECK_MINGW_ORG_TREE: \
&quot;{{.*}}{{/|\\\\}}Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\ \
\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward&quot;<br> \
+// CHECK_MINGW_ORG_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include&quot;<br>
 +// CHECK_MINGW_ORG_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include-fixed&quot;<br>
 +// CHECK_MINGW_ORG_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}mingw32{{/|\\\\}}include&quot;<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&gt;&amp;1 | FileCheck \
-check-prefix=CHECK_MINGW_BUILDS_TREE %s<br> +// CHECK_MINGW_BUILDS_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++&quot;<br>
 +// CHECK_MINGW_BUILDS_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}i686-w64-mingw32&quot;<br>
 +// CHECK_MINGW_BUILDS_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward&quot;<br>
 +// CHECK_MINGW_BUILDS_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include&quot;<br>
 +// CHECK_MINGW_BUILDS_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include-fixed&quot;<br>
 +// CHECK_MINGW_BUILDS_TREE: \
&quot;{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include&quot;<br>
 +<br>
+<br>
+// RUN: %clang -target i686-pc-windows-gnu -c -### \
--sysroot=%S/Inputs/mingw_msys2_tree/msys64/mingw32 %s 2&gt;&amp;1 | FileCheck \
-check-prefix=CHECK_MINGW_MSYS_TREE %s<br> +// CHECK_MINGW_MSYS_TREE: \
&quot;{{.*}}/Inputs/mingw_msys2_tree/msys64{{/|\\\\}}mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2&quot;<br>
 +// CHECK_MINGW_MSYS_TREE: \
&quot;{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}i686-w64-mingw32&quot;<br>
 +// CHECK_MINGW_MSYS_TREE: \
&quot;{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}backward&quot;<br>
 +// CHECK_MINGW_MSYS_TREE:   \
&quot;{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include&quot;<br>
 +// CHECK_MINGW_MSYS_TREE:   \
&quot;{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include-fixed&quot;<br>
 +// CHECK_MINGW_MSYS_TREE: \
&quot;{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include&quot;<br>
 +// CHECK_MINGW_MSYS_TREE: \
&quot;{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include&quot;<br> +<br>
+<br>
+// RUN: %clang -target x86_64-pc-windows-gnu -c -### \
--sysroot=%S/Inputs/mingw_opensuse_tree/usr %s 2&gt;&amp;1 | FileCheck \
-check-prefix=CHECK_MINGW_OPENSUSE_TREE %s<br> +// CHECK_MINGW_OPENSUSE_TREE: \
&quot;{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++&quot;<br>
 +// CHECK_MINGW_OPENSUSE_TREE: \
&quot;{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_6 \
4-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}x86_64-w64-mingw32&quot;<br>
 +// CHECK_MINGW_OPENSUSE_TREE: \
&quot;{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_6 \
4-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward&quot;<br>
 +// CHECK_MINGW_OPENSUSE_TREE: \
&quot;{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include&quot;<br>
 +// CHECK_MINGW_OPENSUSE_TREE: \
&quot;/usr/x86_64-w64-mingw32/sys-root/mingw/include&quot;<br> +// \
CHECK_MINGW_OPENSUSE_TREE: \
&quot;{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed&quot;<br>
 +<br>
+<br>
+// RUN: %clang -target i686-pc-windows-gnu -c -### \
--sysroot=%S/Inputs/mingw_arch_tree/usr %s 2&gt;&amp;1 | FileCheck \
-check-prefix=CHECK_MINGW_ARCH_TREE %s<br> +// CHECK_MINGW_ARCH_TREE: \
&quot;{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0&quot;<br>
 +// CHECK_MINGW_ARCH_TREE: \
&quot;{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}i686-w64-mingw32&quot;<br>
 +// CHECK_MINGW_ARCH_TREE: \
&quot;{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}backward&quot;<br>
 +// CHECK_MINGW_ARCH_TREE: \
&quot;{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include&quot;<br>
 +// CHECK_MINGW_ARCH_TREE: \
&quot;{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed&quot;<br>
 +// CHECK_MINGW_ARCH_TREE: \
&quot;{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include&quot;<br>
 +<br>
+<br>
+// RUN: %clang -target x86_64-pc-windows-gnu -c -### \
--sysroot=%S/Inputs/mingw_ubuntu_tree/usr %s 2&gt;&amp;1 | FileCheck \
-check-prefix=CHECK_MINGW_UBUNTU_TREE %s<br> +// CHECK_MINGW_UBUNTU_TREE: \
&quot;{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8&quot;<br>
 +// CHECK_MINGW_UBUNTU_TREE: \
&quot;{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}x86_64-w64-mingw32&quot;<br>
 +// CHECK_MINGW_UBUNTU_TREE: \
&quot;{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}backward&quot;<br>
 +// CHECK_MINGW_UBUNTU_TREE: \
&quot;{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include&quot;<br>
 +// CHECK_MINGW_UBUNTU_TREE: \
&quot;{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include-fixed&quot;<br>
 +// CHECK_MINGW_UBUNTU_TREE: \
&quot;{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}include&quot;<br>
 <br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
</div></div><a href="mailto:cfe-commits@cs.uiuc.edu" \
target="_blank">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></blockquote></div></div></div> \
</div></div></blockquote></div></div></div>



_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits


[prev in list] [next in list] [prev in thread] [next in thread]