summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Transforms/Instrumentation
diff options
context:
space:
mode:
authorRenato Golin <renato.golin@linaro.org>2016-05-10 08:23:57 +0000
committerRenato Golin <renato.golin@linaro.org>2016-05-10 08:23:57 +0000
commitd876eecf02ca031b910803c09b9a64db0c569bb1 (patch)
tree5c1ae69e66978437b35d9b58536e2d216a5bc8e7 /llvm/lib/Transforms/Instrumentation
parent8e5b0c65ccb012c850a8d11cc74eafe79dea5825 (diff)
downloadbcm5719-llvm-d876eecf02ca031b910803c09b9a64db0c569bb1.tar.gz
bcm5719-llvm-d876eecf02ca031b910803c09b9a64db0c569bb1.zip
Revert "[PGO] Fix __llvm_profile_raw_version linkage in MACHO IR instrumentation generates a COMDAT symbol __llvm_profile_raw_version to overwrite the same symbol in profile run-time to distinguish IR profiles from Clang generated profiles. In MACHO, LinkOnceODR linkage is used due to the lack of COMDAT support."
This reverts commits r268969, r268979 and r268984. They had target specific test in generic directories without the correct specifiers and made it hard for us to come up with a good solution by rapidly committing untested changes. This test needs to be in a target specific directory or have the correct REQUIRED identifier. llvm-svn: 269027
Diffstat (limited to 'llvm/lib/Transforms/Instrumentation')
-rw-r--r--llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
index ef496840fab..90d4ba07abf 100644
--- a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
+++ b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
@@ -775,7 +775,7 @@ static void createIRLevelProfileFlagVariable(Module &M) {
IRLevelVersionVariable->setVisibility(GlobalValue::DefaultVisibility);
Triple TT(M.getTargetTriple());
if (TT.isOSBinFormatMachO())
- IRLevelVersionVariable->setLinkage(GlobalValue::LinkOnceAnyLinkage);
+ IRLevelVersionVariable->setLinkage(GlobalValue::LinkOnceODRLinkage);
else
IRLevelVersionVariable->setComdat(M.getOrInsertComdat(
StringRef(INSTR_PROF_QUOTE(IR_LEVEL_PROF_VERSION_VAR))));
OpenPOWER on IntegriCloud