summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJF Bastien <jfbastien@apple.com>2019-08-02 21:52:35 +0000
committerJF Bastien <jfbastien@apple.com>2019-08-02 21:52:35 +0000
commitdc8af80c190e86a2562b2edf9ca91ca44912e6b6 (patch)
tree06d12e3958461536bc9616e2c368c6fe4fc95100
parentfa5c340ea12e5f5b217246767190d32ccb7df54a (diff)
downloadbcm5719-llvm-dc8af80c190e86a2562b2edf9ca91ca44912e6b6.tar.gz
bcm5719-llvm-dc8af80c190e86a2562b2edf9ca91ca44912e6b6.zip
Remove support for unsupported MSVC versions
Reviewers: rnk, lebedev.ri Subscribers: hiraditya, jkorous, dexonsmith, lebedev.ri, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D65662 llvm-svn: 367727
-rw-r--r--llvm/include/llvm/Demangle/DemangleConfig.h7
-rw-r--r--llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp8
-rw-r--r--llvm/lib/Support/Windows/explicit_symbols.inc6
3 files changed, 1 insertions, 20 deletions
diff --git a/llvm/include/llvm/Demangle/DemangleConfig.h b/llvm/include/llvm/Demangle/DemangleConfig.h
index 73f89d357c8..b7b7dbd24c7 100644
--- a/llvm/include/llvm/Demangle/DemangleConfig.h
+++ b/llvm/include/llvm/Demangle/DemangleConfig.h
@@ -15,13 +15,6 @@
#ifndef LLVM_DEMANGLE_COMPILER_H
#define LLVM_DEMANGLE_COMPILER_H
-#ifdef _MSC_VER
-// snprintf is implemented in VS 2015
-#if _MSC_VER < 1900
-#define snprintf _snprintf_s
-#endif
-#endif
-
#ifndef __has_feature
#define __has_feature(x) 0
#endif
diff --git a/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp b/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp
index 4e0b8587c61..7d0fa0f91e6 100644
--- a/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp
+++ b/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp
@@ -73,13 +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."
+ const wchar_t *msdia_dll = L"msdia140.dll";
#endif
HRESULT HR;
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
OpenPOWER on IntegriCloud