From: Anton Korobeynikov <asl@math.spbu.ru>
Date: Wed, 9 Jul 2008 19:06:02 +0000 (+0000)
Subject: Weak stuff always goes to coalesced sections on Darwin
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f56c2f7a4b03ccb469ac902bed40981cc4ff3b66;p=oota-llvm.git

Weak stuff always goes to coalesced sections on Darwin

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

diff --git a/lib/Target/X86/X86TargetAsmInfo.cpp b/lib/Target/X86/X86TargetAsmInfo.cpp
index ec9864074f8..965e8d6b77a 100644
--- a/lib/Target/X86/X86TargetAsmInfo.cpp
+++ b/lib/Target/X86/X86TargetAsmInfo.cpp
@@ -263,9 +263,13 @@ X86DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
    case SectionKind::ROData:
     return (isWeak ? ConstDataCoalSection : getReadOnlySection_());
    case SectionKind::RODataMergeStr:
-    return MergeableStringSection(cast<GlobalVariable>(GV));
+    return (isWeak ?
+            ConstDataCoalSection :
+            MergeableStringSection(cast<GlobalVariable>(GV)));
    case SectionKind::RODataMergeConst:
-    return MergeableConstSection(cast<GlobalVariable>(GV));
+    return (isWeak ?
+            ConstDataCoalSection:
+            MergeableConstSection(cast<GlobalVariable>(GV)));
    default:
     assert(0 && "Unsuported section kind for global");
   }