diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2014-06-10 21:07:12 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2014-06-10 21:07:12 +0000 |
| commit | 07216a1161173c0c3f81544459eb4feae808bf8c (patch) | |
| tree | ae7a7f8e469377f6f23dddb4877d2378b705d9be | |
| parent | 73429fd4a69504bb6fb4bbfc550f649eb102099a (diff) | |
| download | bcm5719-llvm-07216a1161173c0c3f81544459eb4feae808bf8c.tar.gz bcm5719-llvm-07216a1161173c0c3f81544459eb4feae808bf8c.zip | |
Fix crash with x86_64-pc-win32-macho target. <rdar://problem/17235840>
The changes in r204978 broke win32-macho targets. There were checks added for
MSVC and Itanium environments as special cases, and win32-macho needs to be
treated the same way.
llvm-svn: 210584
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Misc/win32-macho.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index d2890f0857c..d2edc9479f6 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/lib/Frontend/InitHeaderSearch.cpp @@ -472,7 +472,8 @@ void InitHeaderSearch::AddDefaultIncludePaths(const LangOptions &Lang, case llvm::Triple::Win32: if (triple.getEnvironment() == llvm::Triple::MSVC || - triple.getEnvironment() == llvm::Triple::Itanium) + triple.getEnvironment() == llvm::Triple::Itanium || + triple.getObjectFormat() == llvm::Triple::MachO) return; break; } diff --git a/clang/test/Misc/win32-macho.c b/clang/test/Misc/win32-macho.c new file mode 100644 index 00000000000..2879ba4479c --- /dev/null +++ b/clang/test/Misc/win32-macho.c @@ -0,0 +1,2 @@ +// Check that basic use of win32-macho targets works. +// RUN: %clang -c -target x86_64-pc-win32-macho %s |
