Index: clang/lib/Driver/ToolChains/Fuchsia.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Fuchsia.cpp
+++ clang/lib/Driver/ToolChains/Fuchsia.cpp
@@ -103,6 +103,7 @@
   addSanitizerRuntimes(ToolChain, Args, CmdArgs);
 
   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
+  ToolChain.addProfileRTLibs(Args, CmdArgs);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
     if (Args.hasArg(options::OPT_static))
Index: compiler-rt/cmake/config-ix.cmake
===================================================================
--- compiler-rt/cmake/config-ix.cmake
+++ compiler-rt/cmake/config-ix.cmake
@@ -545,7 +545,7 @@
 endif()
 
 if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|SunOS")
+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS")
   set(COMPILER_RT_HAS_PROFILE TRUE)
 else()
   set(COMPILER_RT_HAS_PROFILE FALSE)
Index: compiler-rt/lib/profile/CMakeLists.txt
===================================================================
--- compiler-rt/lib/profile/CMakeLists.txt
+++ compiler-rt/lib/profile/CMakeLists.txt
@@ -49,21 +49,29 @@
 add_compiler_rt_component(profile)
 
 set(PROFILE_SOURCES
-  GCDAProfiling.c
   InstrProfiling.c
   InstrProfilingValue.c
   InstrProfilingBuffer.c
-  InstrProfilingFile.c
   InstrProfilingMerge.c
-  InstrProfilingMergeFile.c
   InstrProfilingNameVar.c
   InstrProfilingWriter.c
-  InstrProfilingPlatformDarwin.c
-  InstrProfilingPlatformLinux.c
-  InstrProfilingPlatformOther.c
   InstrProfilingRuntime.cc
   InstrProfilingUtil.c)
 
+if(FUCHSIA)
+  list(APPEND PROFILE_SOURCES
+    InstrProfilingPlatformFuchsia.c
+    InstrProfilingPlatformLinux.c)
+else()
+  list(APPEND PROFILE_SOURCES
+    GCDAProfiling.c
+    InstrProfilingFile.c
+    InstrProfilingMergeFile.c
+    InstrProfilingPlatformDarwin.c
+    InstrProfilingPlatformLinux.c
+    InstrProfilingPlatformOther.c)
+endif()
+
 if(WIN32)
     list(APPEND PROFILE_SOURCES WindowsMMap.c)
 endif()
Index: compiler-rt/lib/profile/InstrProfilingPlatformFuchsia.c
===================================================================
--- /dev/null
+++ compiler-rt/lib/profile/InstrProfilingPlatformFuchsia.c
@@ -0,0 +1,108 @@
+/*===- InstrProfilingPlatformFuchsia.c - Profile data Linux platform ------===*\
+|*
+|*                     The LLVM Compiler Infrastructure
+|*
+|* This file is distributed under the University of Illinois Open Source
+|* License. See LICENSE.TXT for details.
+|*
+\*===----------------------------------------------------------------------===*/
+
+#if defined(__Fuchsia__)
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include <zircon/process.h>
+#include <zircon/sanitizer.h>
+#include <zircon/syscalls.h>
+
+#include "InstrProfiling.h"
+#include "InstrProfilingInternal.h"
+#include "InstrProfilingUtil.h"
+
+static const size_t MappingSize = sizeof(uintptr_t) << 32;
+const char ProfileSinkName[] = "profile";
+
+/* This method is invoked by the runtime initialization hook
+ * InstrProfilingRuntime.o if it is linked in.
+ */
+COMPILER_RT_VISIBILITY
+void __llvm_profile_initialize_file(void) {
+  /* Unsupported */
+}
+
+static int dump(void) {
+  if (lprofProfileDumped()) {
+    PROF_NOTE("Profile data not written to file: %s.\n",
+              "already written");
+    return 0;
+  }
+
+  /* Check if there is llvm/runtime version mismatch.  */
+  if (GET_VERSION(__llvm_profile_get_version()) != INSTR_PROF_RAW_VERSION) {
+    PROF_ERR("Runtime and instrumentation version mismatch : "
+             "expected %d, but get %d\n",
+             INSTR_PROF_RAW_VERSION,
+             (int)GET_VERSION(__llvm_profile_get_version()));
+    return -1;
+  }
+
+  char vmo_name[ZX_MAX_NAME_LEN];
+  zx_status_t status;
+
+  zx_info_handle_basic_t info;
+  status = _zx_object_get_info(_zx_process_self(), ZX_INFO_HANDLE_BASIC, &info,
+                               sizeof(info), NULL, NULL);
+  if (status != ZX_OK)
+    return -1;
+
+  zx_handle_t vmo;
+
+  status = _zx_vmo_create(__llvm_profile_get_size_for_buffer(), 0, &vmo);
+  if (status != ZX_OK)
+    return -1;
+
+  // Give the VMO a name including our process KOID so it's easy to spot.
+  snprintf(vmo_name, sizeof(vmo_name), "%s.%zu", ProfileSinkName,
+           info.koid);
+  _zx_object_set_property(vmo, ZX_PROP_NAME, vmo_name, strlen(vmo_name));
+
+  uintptr_t mapping;
+  status = _zx_vmar_map(_zx_vmar_root_self(), 0, vmo, 0, MappingSize,
+                        ZX_VM_FLAG_PERM_READ | ZX_VM_FLAG_PERM_WRITE, &mapping);
+  if (status != ZX_OK)
+    return -1;
+
+  if (__llvm_profile_write_buffer((char *)mapping) != 0)
+    return -1;
+
+  /* Publish the VMO which contains profile data to the system. */
+  __sanitizer_publish_data(ProfileSinkName, vmo);
+
+  return 0;
+}
+
+COMPILER_RT_VISIBILITY
+int __llvm_profile_dump(void) {
+  int rc = dump();
+  lprofSetProfileDumped();
+  return rc;
+}
+
+static void dumpWithoutReturn(void) { dump(); }
+
+COMPILER_RT_VISIBILITY
+int __llvm_profile_register_write_file_atexit(void) {
+  static int HasBeenRegistered = 0;
+
+  if (HasBeenRegistered)
+    return 0;
+
+  lprofSetupValueProfiler();
+
+  HasBeenRegistered = 1;
+  return atexit(dumpWithoutReturn);
+}
+
+#endif
Index: compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
===================================================================
--- compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
+++ compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
@@ -7,7 +7,7 @@
 |*
 \*===----------------------------------------------------------------------===*/
 
-#if defined(__linux__) || defined(__FreeBSD__) || \
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__Fuchsia__) || \
     (defined(__sun__) && defined(__svr4__))
 
 #include <stdlib.h>
Index: llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
===================================================================
--- llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
+++ llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
@@ -691,6 +691,7 @@
   // Use linker script magic to get data/cnts/name start/end.
   if (Triple(M.getTargetTriple()).isOSLinux() ||
       Triple(M.getTargetTriple()).isOSFreeBSD() ||
+      Triple(M.getTargetTriple()).isOSFuchsia() ||
       Triple(M.getTargetTriple()).isPS4CPU())
     return false;