From: Timur Iskhodzhanov <timurrrr@google.com>
Date: Wed, 11 Sep 2013 11:45:31 +0000 (+0000)
Subject: Fix the ASan dll_thunk path
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4814134df9918ad1414d6f4c6308e0ec0e2fcd2;p=clang

Fix the ASan dll_thunk path

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190516 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index d72358dca0..d519a4c9b5 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -6613,8 +6613,7 @@ void visualstudio::Link::ConstructJob(Compilation &C, const JobAction &JA,
     SmallString<128> LibSanitizer(getToolChain().getDriver().ResourceDir);
     llvm::sys::path::append(LibSanitizer, "lib", "windows");
     if (DLL) {
-      // FIXME: Not sure what the final name of the thunk lib is.
-      llvm::sys::path::append(LibSanitizer, "clang_rt.asan-i386-dll_thunk.lib");
+      llvm::sys::path::append(LibSanitizer, "clang_rt.asan_dll_thunk-i386.lib");
     } else {
       llvm::sys::path::append(LibSanitizer, "clang_rt.asan-i386.lib");
     }
diff --git a/test/Driver/cl-link.c b/test/Driver/cl-link.c
index b789c24823..24e0702c8a 100644
--- a/test/Driver/cl-link.c
+++ b/test/Driver/cl-link.c
@@ -29,5 +29,5 @@
 // ASAN-DLL: "-dll"
 // ASAN-DLL: "-debug"
 // ASAN-DLL: "-incremental:no"
-// ASAN-DLL: "{{.*}}clang_rt.asan-i386-dll_thunk.lib"
+// ASAN-DLL: "{{.*}}clang_rt.asan_dll_thunk-i386.lib"
 // ASAN-DLL: "{{.*}}cl-link{{.*}}.obj"