diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index e4af66b7835e..2141cc9656bd 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -1817,16 +1817,18 @@ static void addProfileRT(
         Args.hasArg(options::OPT_coverage)))
     return;
 
+  // Pull in runtime for -fprofile-inst-generate.  This is required since there
+  // are no calls to the runtime in the code.
+  if (Args.hasArg(options::OPT_fprofile_instr_generate)) {
+    CmdArgs.push_back("-u");
+    CmdArgs.push_back("___llvm_profile_runtime");
+  }
+
   SmallString<128> LibProfile = getCompilerRTLibDir(TC);
   llvm::sys::path::append(LibProfile,
       Twine("libclang_rt.profile-") + getArchNameForCompilerRTLib(TC) + ".a");
 
-  SmallVector<const char *, 3> LibProfileArgs;
-  LibProfileArgs.push_back("-whole-archive");
-  LibProfileArgs.push_back(Args.MakeArgString(LibProfile));
-  LibProfileArgs.push_back("-no-whole-archive");
-
-  CmdArgs.insert(CmdArgs.end(), LibProfileArgs.begin(), LibProfileArgs.end());
+  CmdArgs.push_back(Args.MakeArgString(LibProfile));
 }
 
 static void addSanitizerRTLinkFlags(
diff --git a/clang/test/Driver/coverage-ld.c b/clang/test/Driver/coverage-ld.c
index bb70fe56c817..0e39249a2f3e 100644
--- a/clang/test/Driver/coverage-ld.c
+++ b/clang/test/Driver/coverage-ld.c
@@ -16,11 +16,8 @@
 // RUN:   | FileCheck --check-prefix=CHECK-LINUX-X86-64 %s
 //
 // CHECK-LINUX-X86-64: "{{(.*[^-.0-9A-Z_a-z])?}}ld{{(.exe)?}}"
-// CHECK-LINUX-X86-64: "-whole-archive"
-// CHECK-LINUX-X86-64: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.profile-x86_64.a"
-// CHECK-LINUX-X86-64: "-no-whole-archive"
-// CHECK-LINUX-X86-64: "-lc"
-
+// CHECK-LINUX-X86-64: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.profile-x86_64.a" {{.*}} "-lc"
+//
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
 // RUN:     -target x86_64-unknown-freebsd --coverage \
 // RUN:     -resource-dir=%S/Inputs/resource_dir \