diff options
| -rw-r--r-- | clang/include/clang/Driver/ToolChain.h | 4 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 12 | ||||
| -rw-r--r-- | clang/test/Driver/instrprof-ld.c | 16 |
3 files changed, 28 insertions, 4 deletions
diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h index 58e7c724cd0..03b057ea091 100644 --- a/clang/include/clang/Driver/ToolChain.h +++ b/clang/include/clang/Driver/ToolChain.h @@ -388,8 +388,8 @@ public: /// This checks for presence of the -Ofast, -ffast-math or -funsafe-math flags. virtual bool AddFastMathRuntimeIfAvailable( const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const; - /// addProfileRTLibs - When -fprofile-instr-profile is specified, add profile - /// runtime library, otherwise return false. + /// addProfileRTLibs - When -fprofile-instr-profile is specified, try to pass + /// a suitable profile runtime library to the linker. virtual void addProfileRTLibs(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const; diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 5df96ce54e3..f83c7c9ea8f 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -324,12 +324,20 @@ void Darwin::addProfileRTLibs(const ArgList &Args, if (!needsProfileRT(Args)) return; // Select the appropriate runtime library for the target. - if (isTargetIOSBased()) + if (isTargetWatchOSBased()) { + AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.profile_watchos.a", + /*AlwaysLink*/ true); + } else if (isTargetTvOSBased()) { + AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.profile_tvos.a", + /*AlwaysLink*/ true); + } else if (isTargetIOSBased()) { AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.profile_ios.a", /*AlwaysLink*/ true); - else + } else { + assert(isTargetMacOS() && "unexpected non MacOS platform"); AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.profile_osx.a", /*AlwaysLink*/ true); + } return; } diff --git a/clang/test/Driver/instrprof-ld.c b/clang/test/Driver/instrprof-ld.c index cd926cd186b..b3ba12ee434 100644 --- a/clang/test/Driver/instrprof-ld.c +++ b/clang/test/Driver/instrprof-ld.c @@ -89,3 +89,19 @@ // // CHECK-DARWIN-ARM64: "{{(.*[^-.0-9A-Z_a-z])?}}ld{{(.exe)?}}" // CHECK-DARWIN-ARM64: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}darwin{{/|\\\\}}libclang_rt.profile_ios.a" +// +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: -target armv7-apple-darwin -mtvos-version-min=8.3 -fprofile-instr-generate \ +// RUN: -resource-dir=%S/Inputs/resource_dir \ +// RUN: | FileCheck --check-prefix=CHECK-TVOS-ARMV7 %s +// +// CHECK-TVOS-ARMV7: "{{(.*[^-.0-9A-Z_a-z])?}}ld{{(.exe)?}}" +// CHECK-TVOS-ARMV7: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}darwin{{/|\\\\}}libclang_rt.profile_tvos.a" +// +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: -target armv7s-apple-darwin10 -mwatchos-version-min=2.0 -arch armv7k -fprofile-instr-generate \ +// RUN: -resource-dir=%S/Inputs/resource_dir \ +// RUN: | FileCheck --check-prefix=CHECK-WATCHOS-ARMV7 %s +// +// CHECK-WATCHOS-ARMV7: "{{(.*[^-.0-9A-Z_a-z])?}}ld{{(.exe)?}}" +// CHECK-WATCHOS-ARMV7: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}darwin{{/|\\\\}}libclang_rt.profile_watchos.a" |
