diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2014-09-25 20:47:10 +0000 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2014-09-25 20:47:10 +0000 |
| commit | 5bb7234b237fd62d54f73f8ad32f5977057b954c (patch) | |
| tree | d8d890a98b4a4047b32bb1fb06ba67c3a7d7cba7 | |
| parent | 045423f26d325e7ec95e63c977ca33741e0186b8 (diff) | |
| download | bcm5719-llvm-5bb7234b237fd62d54f73f8ad32f5977057b954c.tar.gz bcm5719-llvm-5bb7234b237fd62d54f73f8ad32f5977057b954c.zip | |
Add support for intercepting functions from msvcr110.dll
Summary: This finishes support for ASAN on MSVC2012.
Test Plan: |ninja check-asan| passes locally with this on MSVC2012.
Reviewers: timurrrr
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D5494
llvm-svn: 218465
| -rw-r--r-- | compiler-rt/lib/interception/interception_win.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc index ecd5d2efa78..cd241c3d23c 100644 --- a/compiler-rt/lib/interception/interception_win.cc +++ b/compiler-rt/lib/interception/interception_win.cc @@ -182,7 +182,10 @@ bool OverrideFunction(uptr old_func, uptr new_func, uptr *orig_old_func) { } static const void **InterestingDLLsAvailable() { - const char *InterestingDLLs[] = { "kernel32.dll", "msvcr120.dll", NULL }; + const char *InterestingDLLs[] = {"kernel32.dll", + "msvcr110.dll", // VS2012 + "msvcr120.dll", // VS2013 + NULL}; static void *result[ARRAY_SIZE(InterestingDLLs)] = { 0 }; if (!result[0]) { for (size_t i = 0, j = 0; InterestingDLLs[i]; ++i) { |
