diff options
| author | JF Bastien <jfbastien@apple.com> | 2019-08-02 23:09:01 +0000 |
|---|---|---|
| committer | JF Bastien <jfbastien@apple.com> | 2019-08-02 23:09:01 +0000 |
| commit | 748dac7389bd9834c4de4ee9cf3fc7937f30bf47 (patch) | |
| tree | 10bc655ad3c8465f09f84f0a977a5141f1cb1eac /llvm/lib | |
| parent | e6ef4f98d28933bf300d709e4dbffc6929748aa6 (diff) | |
| download | bcm5719-llvm-748dac7389bd9834c4de4ee9cf3fc7937f30bf47.tar.gz bcm5719-llvm-748dac7389bd9834c4de4ee9cf3fc7937f30bf47.zip | |
Remove support for unsupported MSVC versions
Re-land r367727 with the #if fixed.
Reviewers: rnk, lebedev.ri
Subscribers: hiraditya, jkorous, dexonsmith, lebedev.ri, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65662
llvm-svn: 367734
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp | 10 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/explicit_symbols.inc | 6 |
2 files changed, 1 insertions, 15 deletions
diff --git a/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp b/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp index 4e0b8587c61..2544a889056 100644 --- a/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp +++ b/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp @@ -73,15 +73,7 @@ static Error LoadDIA(CComPtr<IDiaDataSource> &DiaDataSource) { #if !defined(_MSC_VER) return llvm::make_error<PDBError>(pdb_error_code::dia_failed_loading); #else - const wchar_t *msdia_dll = nullptr; -#if _MSC_VER >= 1900 && _MSC_VER < 2000 - msdia_dll = L"msdia140.dll"; // VS2015 -#elif _MSC_VER >= 1800 - msdia_dll = L"msdia120.dll"; // VS2013 -#else -#error "Unknown Visual Studio version." -#endif - + const wchar_t *msdia_dll = L"msdia140.dll"; HRESULT HR; if (FAILED(HR = NoRegCoCreate(msdia_dll, CLSID_DiaSource, IID_IDiaDataSource, reinterpret_cast<LPVOID *>(&DiaDataSource)))) diff --git a/llvm/lib/Support/Windows/explicit_symbols.inc b/llvm/lib/Support/Windows/explicit_symbols.inc index bbbf7ea6a77..0a4fda1d4e8 100644 --- a/llvm/lib/Support/Windows/explicit_symbols.inc +++ b/llvm/lib/Support/Windows/explicit_symbols.inc @@ -90,12 +90,6 @@ INLINE_DEF_FLOAT_SYMBOL(tanf, 1) INLINE_DEF_FLOAT_SYMBOL(tanhf, 1) - // These were added in VS 2013. -#if (1800 <= _MSC_VER && _MSC_VER < 1900) - INLINE_DEF_FLOAT_SYMBOL(copysignf, 2) - INLINE_DEF_FLOAT_SYMBOL(fminf, 2) - INLINE_DEF_FLOAT_SYMBOL(fmaxf, 2) -#endif #undef INLINE_DEF_FLOAT_SYMBOL #endif |
