Index: clang/lib/Driver/ToolChains/Fuchsia.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Fuchsia.cpp
+++ clang/lib/Driver/ToolChains/Fuchsia.cpp
@@ -105,8 +105,12 @@
 
   if (!Args.hasArg(options::OPT_shared) && !Args.hasArg(options::OPT_r)) {
     std::string Dyld = D.DyldPrefix;
-    if (SanArgs.needsAsanRt() && SanArgs.needsSharedRt())
+    if (SanArgs.needsAsanRt() && !SanArgs.needsUbsanRt() &&
+        SanArgs.needsSharedRt())
       Dyld += "asan/";
+    if (SanArgs.needsAsanRt() && SanArgs.needsUbsanRt() &&
+        SanArgs.needsSharedRt())
+      Dyld += "asan-ubsan/";
     if (SanArgs.needsHwasanRt() && SanArgs.needsSharedRt())
       Dyld += "hwasan/";
     if (SanArgs.needsTsanRt() && SanArgs.needsSharedRt())