From: Renato Golin <renato.golin@linaro.org>
Date: Tue, 10 May 2016 08:23:57 +0000 (+0000)
Subject: Revert "[PGO] Fix __llvm_profile_raw_version linkage in MACHO IR instrumentation... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c1ea17cfaa37f64f7e5fd93c3905aa1db59e908;p=llvm

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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@269027 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
index ef496840fab..90d4ba07abf 100644
--- a/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
+++ b/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))));
diff --git a/test/Transforms/PGOProfile/macho.ll b/test/Transforms/PGOProfile/macho.ll
deleted file mode 100644
index d2fe65f2fa7..00000000000
--- a/test/Transforms/PGOProfile/macho.ll
+++ /dev/null
@@ -1,10 +0,0 @@
-; RUN: opt < %s -pgo-instr-gen -instrprof -S | llc | FileCheck %s --check-prefix=MACHO-DIRECTIVE
-
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.11.0"
-
-; MACHO-DIRECTIVE: .weak_definition        ___llvm_profile_raw_version
-define i32 @test_macho(i32 %i) {
-entry:
-  ret i32 %i
-}