Index: cfe/trunk/lib/Driver/Tools.cpp
===================================================================
--- cfe/trunk/lib/Driver/Tools.cpp
+++ cfe/trunk/lib/Driver/Tools.cpp
@@ -2200,7 +2200,7 @@
   if (Shared) {
     // Link dynamic runtime if necessary.
     SmallString<128> LibSanitizer =
-        getSanitizerRTLibName(TC, "asan", Shared);
+        getSanitizerRTLibName(TC, "asan_dynamic", Shared);
     CmdArgs.insert(CmdArgs.begin(), Args.MakeArgString(LibSanitizer));
   }
 
Index: compiler-rt/trunk/lib/asan/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt
@@ -162,7 +162,7 @@
       add_dependencies(asan clang_rt.asan-preinit-${arch})
 
       add_compiler_rt_runtime(clang_rt.asan-dynamic-${arch} ${arch} SHARED
-        OUTPUT_NAME clang_rt.asan-${arch}
+        OUTPUT_NAME clang_rt.asan_dynamic-${arch}
         SOURCES $<TARGET_OBJECTS:RTAsan_dynamic.${arch}>
                 ${ASAN_COMMON_RUNTIME_OBJECTS}
         CFLAGS ${ASAN_DYNAMIC_CFLAGS}