]> granicus.if.org Git - clang/commit
Merging r243098, r243101, r243105, r243144, and r243153.
authorHans Wennborg <hans@hanshq.net>
Mon, 27 Jul 2015 20:42:22 +0000 (20:42 +0000)
committerHans Wennborg <hans@hanshq.net>
Mon, 27 Jul 2015 20:42:22 +0000 (20:42 +0000)
commit16b7ca5bcfdacd36d164ed8b3e745f0742de3ebd
treed8bd9e4d3164ab47ce9f7f8e5183678b3d583f7a
parent572b4e44ce9a4adab625a5d6fe77ba19626543c7
Merging r243098, r243101, r243105, r243144, and r243153.

------------------------------------------------------------------------
r243098 | yrnkrn | 2015-07-24 01:50:15 -0700 (Fri, 24 Jul 2015) | 7 lines

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.
------------------------------------------------------------------------

------------------------------------------------------------------------
r243101 | yrnkrn | 2015-07-24 02:31:57 -0700 (Fri, 24 Jul 2015) | 3 lines

Try to appease clang buildbot by forcing libstdc++ in mingw.cpp test.
------------------------------------------------------------------------

------------------------------------------------------------------------
r243105 | yrnkrn | 2015-07-24 04:01:45 -0700 (Fri, 24 Jul 2015) | 4 lines

Apparently some of the bots add .svn dirs inside the test/Driver/Inputs
directory structure. Try to make mingw toolchain resilient to such surprises.
------------------------------------------------------------------------

------------------------------------------------------------------------
r243144 | yrnkrn | 2015-07-24 12:18:17 -0700 (Fri, 24 Jul 2015) | 5 lines

Base the sys-root/mingw/include path on sysroot and not on /usr.

Thanks to Richard Smith for pointing this out!
------------------------------------------------------------------------

------------------------------------------------------------------------
r243153 | yrnkrn | 2015-07-24 13:18:27 -0700 (Fri, 24 Jul 2015) | 4 lines

Select the highest version of the mingw toolchain found using Generic_GCC::GCCVersion
similar to the way Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple works.
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_37@243325 91177308-0d34-0410-b5e6-96231b3b80d8
32 files changed:
lib/Driver/MinGWToolChain.cpp
lib/Driver/ToolChains.h
test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/backward/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_arch_tree/usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_arch_tree/usr/lib/gcc/i686-w64-mingw32/5.1.0/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/backward/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/i686-w64-mingw32/include/c++/i686-w64-mingw32/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include-fixed/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_builds_tree/mingw32/lib/gcc/i686-w64-mingw32/4.9.1/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_org_tree/mingw/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include-fixed/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/backward/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_org_tree/mingw/lib/gcc/mingw32/4.8.1/include/c++/mingw32/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_mingw_org_tree/mingw/minw32/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/i686-w64-mingw32/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/backward/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/include/c++/4.9.2/i686-w64-mingw32/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include-fixed/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_msys2_tree/msys64/mingw32/lib/gcc/i686-w64-mingw32/4.9.2/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_opensuse_tree/usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_opensuse_tree/usr/x86_64-w64-mingw32/sys-root/mingw/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/86_64-w64-mingw32/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_ubuntu_tree/usr/include/c++/4.8/backward/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_ubuntu_tree/usr/lib/gcc/x86_64-w64-mingw32/4.8/include/.keep [new file with mode: 0644]
test/Driver/Inputs/mingw_ubuntu_tree/usr/x86_64-w64-mingw32/include/.keep [new file with mode: 0644]
test/Driver/mingw-linux.cpp [deleted file]
test/Driver/mingw-win.cpp [deleted file]
test/Driver/mingw.cpp [new file with mode: 0644]