diff options
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Driver/cl-link.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index d72358dca00..d519a4c9b5c 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/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/clang/test/Driver/cl-link.c b/clang/test/Driver/cl-link.c index b789c248239..24e0702c8ab 100644 --- a/clang/test/Driver/cl-link.c +++ b/clang/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" |
